2.0 Snapshot ebuild, bug 133837

Package-Manager: portage-2.1_rc2

5 files changed, 104 insertions, 19 deletions

diff --git a/net-im/wengophone/ChangeLog b/net-im/wengophone/ChangeLog
index edb8f3a74262..9248d2d83668 100644
--- a/net-im/wengophone/ChangeLog
+++ b/net-im/wengophone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/wengophone
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/ChangeLog,v 1.5 2006/05/23 21:59:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/ChangeLog,v 1.6 2006/05/24 18:19:05 genstef Exp $
+
+*wengophone-2.0_pre20060524 (24 May 2006)
+
+  24 May 2006; Stefan Schweizer <genstef@gentoo.org>
+  +wengophone-2.0_pre20060524.ebuild, wengophone-2.0_pre20099999.ebuild:
+  2.0 Snapshot ebuild, bug 133837
 
 *wengophone-2.0_pre20099999 (23 May 2006)
 
diff --git a/net-im/wengophone/Manifest b/net-im/wengophone/Manifest
index 97c53ade1531..9c6065acdd20 100644
--- a/net-im/wengophone/Manifest
+++ b/net-im/wengophone/Manifest
@@ -6,18 +6,23 @@ MD5 419ff578d45aa5347505b874522111ce files/debian.patch 9954
 RMD160 52f23a49b720413908edf34172343364f9d17e28 files/debian.patch 9954
 SHA256 30273fad323d75f83c97fc6a1cacc651ae153d8dc0eae3337c2241b310d404a3 files/debian.patch 9954
 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
 EBUILD wengophone-1.0_pre20060408.ebuild 1581 RMD160 1ed2dbd135bdf31ac71570d77f8566d420601bd8 SHA1 8cb9a7c2451c4c1cbebe4d290e835783670d37e1 SHA256 2a1671306af8ce040e30d71f83a60f8b433eedc4af69bfa9df3ed1ac3c6379bd
 MD5 11b6114a003f95baec8d537cc29c0cc8 wengophone-1.0_pre20060408.ebuild 1581
 RMD160 1ed2dbd135bdf31ac71570d77f8566d420601bd8 wengophone-1.0_pre20060408.ebuild 1581
 SHA256 2a1671306af8ce040e30d71f83a60f8b433eedc4af69bfa9df3ed1ac3c6379bd wengophone-1.0_pre20060408.ebuild 1581
-EBUILD wengophone-2.0_pre20099999.ebuild 2275 RMD160 c377dc51548c3e752a8392ca7df40268805cbb25 SHA1 7d30c20b7a4ca39a79ace25554d9cf28a60b0ae8 SHA256 35c87226a244d83e449ada3e05a7f0f11567be217ddc05b53492c8c8084ef119
-MD5 b75898e1f909843a1c02fb6eec738c62 wengophone-2.0_pre20099999.ebuild 2275
-RMD160 c377dc51548c3e752a8392ca7df40268805cbb25 wengophone-2.0_pre20099999.ebuild 2275
-SHA256 35c87226a244d83e449ada3e05a7f0f11567be217ddc05b53492c8c8084ef119 wengophone-2.0_pre20099999.ebuild 2275
-MISC ChangeLog 1298 RMD160 acf0ad4bcf54f15e9d285ecdad9ab6b040154f22 SHA1 9f2202f1cf6fa6b66afd14aaccb1a23a63097507 SHA256 43199135b592356951319c85e9237c8b11126e8e16e8d14fd0eeb97b2b56a8dd
-MD5 13b4675effec63b7a6dfcedf8620d2d2 ChangeLog 1298
-RMD160 acf0ad4bcf54f15e9d285ecdad9ab6b040154f22 ChangeLog 1298
-SHA256 43199135b592356951319c85e9237c8b11126e8e16e8d14fd0eeb97b2b56a8dd ChangeLog 1298
+EBUILD wengophone-2.0_pre20060524.ebuild 2366 RMD160 03f79310d72b330e414d4d33a284c10cf0464b59 SHA1 b75f8a1d26825d76d9da557c5ce59278b7fa2cc3 SHA256 fdb3b7edc25c30531ae5ae28d9e518b7479a5d73c6b7c218be9ba1cae1dbe110
+MD5 031ab8f65f102691e2fff92422b928b5 wengophone-2.0_pre20060524.ebuild 2366
+RMD160 03f79310d72b330e414d4d33a284c10cf0464b59 wengophone-2.0_pre20060524.ebuild 2366
+SHA256 fdb3b7edc25c30531ae5ae28d9e518b7479a5d73c6b7c218be9ba1cae1dbe110 wengophone-2.0_pre20060524.ebuild 2366
+EBUILD wengophone-2.0_pre20099999.ebuild 2277 RMD160 e3b04c7bc7900fc1873f9253e1ffdd5d2375a9b4 SHA1 8d56e4711a7df19b294b008701abe324b87de493 SHA256 93a044fed2c3351590f90c03a5853dd451b85a57787b107585591a15e31f165c
+MD5 627d252881721dcae12d247f4fee8ad7 wengophone-2.0_pre20099999.ebuild 2277
+RMD160 e3b04c7bc7900fc1873f9253e1ffdd5d2375a9b4 wengophone-2.0_pre20099999.ebuild 2277
+SHA256 93a044fed2c3351590f90c03a5853dd451b85a57787b107585591a15e31f165c wengophone-2.0_pre20099999.ebuild 2277
+MISC ChangeLog 1502 RMD160 e38d55a885ecedf45c28cd73d2ede0f09e42a0aa SHA1 052b5f5fbcff90b346d4e032234b88488df1f7df SHA256 4a3d6f15a033e0d488400dfc63f38aeeed6049fd167c0307645c73acc0af62da
+MD5 ca91a143b6ecc8fd0c193a8215e4a894 ChangeLog 1502
+RMD160 e38d55a885ecedf45c28cd73d2ede0f09e42a0aa ChangeLog 1502
+SHA256 4a3d6f15a033e0d488400dfc63f38aeeed6049fd167c0307645c73acc0af62da ChangeLog 1502
 MISC metadata.xml 216 RMD160 6ecd7230ae71a2f9cb8c8ba6daa9cd8aac279a71 SHA1 50a040631277adac9286b0d9aedcd7324191e00c SHA256 1f6db7cf7937735fab1694d86efb74d629465e9af9d2295479af4d8835a0c59d
 MD5 6a062824f62adbd459fb0045419ef3d8 metadata.xml 216
 RMD160 6ecd7230ae71a2f9cb8c8ba6daa9cd8aac279a71 metadata.xml 216
@@ -25,13 +30,16 @@ 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 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEc4XSNJowsmZ/PzARAtr3AJ9VxyHpu/ixMcLLYjA2CJP9OhI0CgCfeKrs
-oS4wHairIYWYpnqGbR8UtHk=
-=MBOs
+iD8DBQFEdKOCNJowsmZ/PzARAiFXAJ0W9BhhcEHskcCNa7FIo0SSf561owCgjFzo
+IrdbzdXAq26g93kdW525WIU=
+=UBNz
 -----END PGP SIGNATURE-----
diff --git a/net-im/wengophone/files/digest-wengophone-2.0_pre20060524 b/net-im/wengophone/files/digest-wengophone-2.0_pre20060524
new file mode 100644
index 000000000000..9e4536ea31c2
--- /dev/null
+++ b/net-im/wengophone/files/digest-wengophone-2.0_pre20060524
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..5a303f7e2a54
--- /dev/null
+++ b/net-im/wengophone/wengophone-2.0_pre20060524.ebuild
@@ -0,0 +1,69 @@
+# 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.1 2006/05/24 18:19:05 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/public_html/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
+}
diff --git a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild b/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
index 5bc5363bceb6..d2ae03c55eec 100644
--- a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
+++ b/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2006/05/23 21:59:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/wengophone-2.0_pre20099999.ebuild,v 1.2 2006/05/24 18:19:05 genstef Exp $
 
 inherit subversion eutils toolchain-funcs
 
@@ -57,13 +57,12 @@ src_compile() {
 
 src_install() {
 	cd release-symbols
-	insinto /opt/wengophone
+	insinto /usr/share/wengophone
 	doins -r emoticons pics sounds
-	exeinto /opt/wengophone
-	doexe wengophone/src/presentation/qt/qtwengophone
-	exeinto /opt/wengophone/lib
-	doexe wifo/phapi/libphapi.so libs/curl/libowcurl.so
-	make_wrapper wengophone ./qtwengophone /opt/wengophone /opt/wengophone/lib
+	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
 }