New ebuild with patches from debian which are again based on the rpm patches by GlaDiaC, remove old ebuilds and live ebuild

(Portage version: 2.1.1_pre5)
 (Unsigned Manifest commit)

6 files changed, 13 insertions, 188 deletions

diff --git a/net-im/wengophone/Manifest b/net-im/wengophone/Manifest
index f25ec481ac9b..1ee7e6832a1d 100644
--- a/net-im/wengophone/Manifest
+++ b/net-im/wengophone/Manifest
@@ -2,28 +2,21 @@ 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_pre20060719.tar.bz2 8856319 RMD160 c19cb1f49915c0162db4eb2ad31ec0e8d5c8dc06 SHA1 a4777a439cee676099a6719da778d39235781d2e SHA256 29ec01cba5639626e90dc63557d312205b4c2602e5eabdc7a2509bae9dd5665b
+DIST wengophone_2.0.0~rc2-svn7135-1.diff.gz 9853 RMD160 4e7c44be64a21c931170aebb5a0f2599102ce272 SHA1 63e3f2b16374d8e031eb6ad9f1821b6665c47c4a SHA256 168ca17abb20f5714bad316ed2c8f8c38aed271273d318b5b3ff47cfd74636e6
+DIST wengophone_2.0.0~rc2-svn7135.orig.tar.gz 17303205 RMD160 76e0b82eee3e8f61621b6429fd4fabdab61bc733 SHA1 b124f4af0f63c3988fc06f0b4b41cf2f81056f78 SHA256 aa4cd67dc114b15b293177e2e22007900dea8f6997d84164571e123a2570fcdb
 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_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
+EBUILD wengophone-2.0_rc2.ebuild 2246 RMD160 66715c6dda3042d97b113cc3050faffd1b0d6320 SHA1 046d3150a807adb204a1cd347ede765ab7323f39 SHA256 4afa803a002795618f4ca6d8e79ce41fa6669b9dc378fc12a80637aa05f91814
+MD5 941ab60672e336cf72b6c7ce59776d80 wengophone-2.0_rc2.ebuild 2246
+RMD160 66715c6dda3042d97b113cc3050faffd1b0d6320 wengophone-2.0_rc2.ebuild 2246
+SHA256 4afa803a002795618f4ca6d8e79ce41fa6669b9dc378fc12a80637aa05f91814 wengophone-2.0_rc2.ebuild 2246
+MISC ChangeLog 2438 RMD160 47400a53707c02e2b603182a25f3bb17a1535731 SHA1 5aa8f4e4037ba236d2f271347bc0561069b04485 SHA256 1e9abe3974936aa09c5abdfb964ec68475a34d02c0088f7863366f0a0e1ec3c4
+MD5 39e1dbd836fcc7441e72a04510f49f75 ChangeLog 2438
+RMD160 47400a53707c02e2b603182a25f3bb17a1535731 ChangeLog 2438
+SHA256 1e9abe3974936aa09c5abdfb964ec68475a34d02c0088f7863366f0a0e1ec3c4 ChangeLog 2438
 MISC metadata.xml 216 RMD160 6ecd7230ae71a2f9cb8c8ba6daa9cd8aac279a71 SHA1 50a040631277adac9286b0d9aedcd7324191e00c SHA256 1f6db7cf7937735fab1694d86efb74d629465e9af9d2295479af4d8835a0c59d
 MD5 6a062824f62adbd459fb0045419ef3d8 metadata.xml 216
 RMD160 6ecd7230ae71a2f9cb8c8ba6daa9cd8aac279a71 metadata.xml 216
@@ -31,9 +24,6 @@ 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 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
+MD5 f1783ebb24cac81be80113e0b9958de3 files/digest-wengophone-2.0_rc2 596
+RMD160 eba239d41d83e51d4b363672bea5c35c20e65ffc files/digest-wengophone-2.0_rc2 596
+SHA256 f42c147b30f5bca88af89cdcd981c5f83eef8f2a55296eeabef4ab53b2d5d057 files/digest-wengophone-2.0_rc2 596
diff --git a/net-im/wengophone/files/digest-wengophone-2.0_pre20060719 b/net-im/wengophone/files/digest-wengophone-2.0_pre20060719
deleted file mode 100644
index 09429994e7ed..000000000000
--- a/net-im/wengophone/files/digest-wengophone-2.0_pre20060719
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e3d751288cc2265c9df6160e0f5fa3ed wengophone-2.0_pre20060719.tar.bz2 8856319
-RMD160 c19cb1f49915c0162db4eb2ad31ec0e8d5c8dc06 wengophone-2.0_pre20060719.tar.bz2 8856319
-SHA256 29ec01cba5639626e90dc63557d312205b4c2602e5eabdc7a2509bae9dd5665b wengophone-2.0_pre20060719.tar.bz2 8856319
diff --git a/net-im/wengophone/files/digest-wengophone-2.0_pre20099999 b/net-im/wengophone/files/digest-wengophone-2.0_pre20099999
deleted file mode 100644
index 8b137891791f..000000000000
--- a/net-im/wengophone/files/digest-wengophone-2.0_pre20099999
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/net-im/wengophone/files/ffmpeg-system.scons b/net-im/wengophone/files/ffmpeg-system.scons
deleted file mode 100644
index fe9a1858a8b7..000000000000
--- a/net-im/wengophone/files/ffmpeg-system.scons
+++ /dev/null
@@ -1,18 +0,0 @@
-env = WengoGetEnvironment()

-

-libs = []

-lib_path = []

-include_path = []

-defines = {}

-

-libs += [

-	'avutil',

-	'avcodec',

-]

-

-env.WengoAddIncludePath(include_path)

-env.WengoAddLibPath(lib_path)

-env.WengoAddDefines(defines)

-env.WengoUseLibraries(libs)

-

-env.WengoDeclareSystemLibrary('ffmpeg')

diff --git a/net-im/wengophone/wengophone-2.0_pre20060719.ebuild b/net-im/wengophone/wengophone-2.0_pre20060719.ebuild
deleted file mode 100644
index 67d34b1f61dc..000000000000
--- a/net-im/wengophone/wengophone-2.0_pre20060719.ebuild
+++ /dev/null
@@ -1,62 +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_pre20060719.ebuild,v 1.1 2006/07/19 11:36:12 genstef Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Wengophone NG is a VoIP client featuring the SIP protcol"
-HOMEPAGE="http://dev.openwengo.com"
-SRC_URI="http://gentooexperimental.org/~genstef/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
-	media-video/ffmpeg
-	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 && ! grep visit_each.hpp /usr/include/boost/bind.hpp >/dev/null 2>&1; then
-		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"
-	fi
-}
-
-src_compile() {
-	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
-}
diff --git a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild b/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
deleted file mode 100644
index bb32604f4df5..000000000000
--- a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
+++ /dev/null
@@ -1,81 +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_pre20099999.ebuild,v 1.4 2006/07/19 11:36:12 genstef Exp $
-
-inherit subversion eutils toolchain-funcs
-
-DESCRIPTION="Wengophone NG is a VoIP client featuring the SIP protcol"
-HOMEPAGE="http://dev.openwengo.com"
-SRC_URI=""
-ESVN_REPO_URI="http://dev.openwengo.com/svn/openwengo/wengophone-ng/trunk"
-ESVN_OPTIONS="--username guest --password guest"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-*"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	dev-libs/glib
-	dev-libs/openssl
-	media-libs/alsa-lib
-	media-video/ffmpeg
-	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 && ! grep visit_each.hpp /usr/include/boost/bind.hpp >/dev/null 2>&1; then
-		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"
-	fi
-}
-
-src_compile() {
-	# use system ffmpeg
-	cp ${FILESDIR}/ffmpeg-system.scons libs/ffmpeg/SConscript
-	sed -i -e "s:<avcodec.h:<ffmpeg/avcodec.h:" \
-		./libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c \
-		./libs/pixertool/include/pixertool/pixertool.h \
-		./libs/pixertool/include/pixertool/ffmpeg-pixertool.h \
-		./wifo/phapi/phcodec-mpeg4.c \
-		./wifo/phapi/phcodec-mpeg4.h \
-		./wifo/phapi/phcodec-avcodec-wrapper.c \
-		./wifo/phapi/phcodec-avcodec-wrapper.h \
-		./wifo/phapi/phmedia-video-bwcontrol.c \
-		./wifo/phapi/phmedia-video.c \
-		./wifo/phapi/phmedia-video-control.c \
-		./wifo/phapi/phapi.c \
-		./wifo/phapi/phcodec-h263.c \
-		./wifo/phapi/phcodec-h263.h \
-		./wifo/phapi/phcodec-h264.c \
-		./wengophone/src/presentation/qt/QtAbout.cpp
-
-	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
-}