Added avahi howl and meanwhile support.

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 64 insertions, 13 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 0f40cf24e4de..14e76a421ff8 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.394 2006/06/30 15:51:09 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.395 2006/07/01 19:16:17 gothgirl Exp $
+
+  01 Jul 2006; gothgirl <gothgirl@gentoo.org>
+  +files/gaim-2.0.0_beta3-avahi-compat.patch, gaim-2.0.0_beta3-r1.ebuild:
+  Added avahi-howl and meanwhile support.
 
   30 Jun 2006; gothgirl <gothgirl@gentoo.org> gaim-2.0.0_beta3-r1.ebuild:
   added gadu gadu protocol support
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 6296ac621aaa..c87ac0156a46 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -6,20 +6,24 @@ AUX gaim-2.0.0_beta3-as-needed.patch 401 RMD160 5546fb8a00b774ee17e9e5d605f5b0ed
 MD5 5b872a7214f3650a286c300a7511cc94 files/gaim-2.0.0_beta3-as-needed.patch 401
 RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 files/gaim-2.0.0_beta3-as-needed.patch 401
 SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 files/gaim-2.0.0_beta3-as-needed.patch 401
+AUX gaim-2.0.0_beta3-avahi-compat.patch 977 RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 SHA1 a7e7117ce866fb1ef277fb6048bc8b27adf36c4d SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28
+MD5 ebb905b4a73583eaa4b68c022beb110f files/gaim-2.0.0_beta3-avahi-compat.patch 977
+RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 files/gaim-2.0.0_beta3-avahi-compat.patch 977
+SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28 files/gaim-2.0.0_beta3-avahi-compat.patch 977
 DIST gaim-1.5.0.tar.bz2 6123237
 DIST gaim-2.0.0beta3.tar.bz2 8056708 RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 SHA1 e23363cdcf928d503c6fa583239537b409d10b84 SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710
 EBUILD gaim-1.5.0.ebuild 4378 RMD160 6087a5b3705ba8e1fa6758f91c827391ee0011e9 SHA1 048f17acbf18e5577a64263e431ebd8f539ec15e SHA256 799f0ce6662c968d994dad6481b3ee2d96e1bbb7350ebafed3e00612883f650e
 MD5 a148b4dfc20af2c9a6824f30d0735c8a gaim-1.5.0.ebuild 4378
 RMD160 6087a5b3705ba8e1fa6758f91c827391ee0011e9 gaim-1.5.0.ebuild 4378
 SHA256 799f0ce6662c968d994dad6481b3ee2d96e1bbb7350ebafed3e00612883f650e gaim-1.5.0.ebuild 4378
-EBUILD gaim-2.0.0_beta3-r1.ebuild 6024 RMD160 82fe49c7b83a64f12dc8949aea85c88edc821fff SHA1 80a0fec54d8fd4443371f8ab33487c5bbe5db236 SHA256 dc6484fa041069715f90b1832d981d4e430e819867c616cecdb999b6c2809b0c
-MD5 a749b7ee079b648f5662afbf4fca2bc1 gaim-2.0.0_beta3-r1.ebuild 6024
-RMD160 82fe49c7b83a64f12dc8949aea85c88edc821fff gaim-2.0.0_beta3-r1.ebuild 6024
-SHA256 dc6484fa041069715f90b1832d981d4e430e819867c616cecdb999b6c2809b0c gaim-2.0.0_beta3-r1.ebuild 6024
-MISC ChangeLog 57368 RMD160 7980fdf28bd45ee36b4915dca8ed401643816492 SHA1 707fc612aadcc3aadcc6bf31e7bb634d72e92fd9 SHA256 4aad1ca36e062ad46d12e7cc1b97707d5d1ab7735a649689d518370647163e66
-MD5 afbcf19ff9d651bed731cedf091043a0 ChangeLog 57368
-RMD160 7980fdf28bd45ee36b4915dca8ed401643816492 ChangeLog 57368
-SHA256 4aad1ca36e062ad46d12e7cc1b97707d5d1ab7735a649689d518370647163e66 ChangeLog 57368
+EBUILD gaim-2.0.0_beta3-r1.ebuild 6441 RMD160 70ff2603d151a5aac16aac84245d6724d6e88c4c SHA1 24c6dd3892144ee3325c7094c87931713fb3b073 SHA256 5c1ee637462603c3cc54b6a0a8ea77511d3666ae05636dc477b24eeafedf7340
+MD5 46612428a77967ba1d88f41476ee61fc gaim-2.0.0_beta3-r1.ebuild 6441
+RMD160 70ff2603d151a5aac16aac84245d6724d6e88c4c gaim-2.0.0_beta3-r1.ebuild 6441
+SHA256 5c1ee637462603c3cc54b6a0a8ea77511d3666ae05636dc477b24eeafedf7340 gaim-2.0.0_beta3-r1.ebuild 6441
+MISC ChangeLog 57531 RMD160 794b4f9c5a60eedec884eced5f4e86910a03554a SHA1 d587c917bc16bdb1419a9d6587b7f0e83b0d17b1 SHA256 7afcc17fbb6dc93cf14901ee3dbd92dc730ae8e10dfb39002727e31580357873
+MD5 e628a0c125b6f609df2e3e3894254034 ChangeLog 57531
+RMD160 794b4f9c5a60eedec884eced5f4e86910a03554a ChangeLog 57531
+SHA256 7afcc17fbb6dc93cf14901ee3dbd92dc730ae8e10dfb39002727e31580357873 ChangeLog 57531
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch b/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch
new file mode 100644
index 000000000000..2520e7233d7e
--- /dev/null
+++ b/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch
@@ -0,0 +1,30 @@
+diff -ur gaim-2.0.0beta3/configure.ac gaim-2.0.0beta3-patched/configure.ac
+--- gaim-2.0.0beta3/configure.ac	2006-03-26 07:45:35.000000000 +0000
++++ gaim-2.0.0beta3-patched/configure.ac	2006-05-07 23:13:46.000000000 +0000
+@@ -183,15 +183,17 @@
+ HOWL_CFLAGS=""
+ HOWL_LIBS=""
+ 
+-dnl Attempt to autodetect Howl
+-PKG_CHECK_MODULES(HOWL, howl, [
+-		howlincludes="yes"
+-		howllibs="yes"
+-	], [
+-		AC_MSG_RESULT(no)
+-		howlincludes="no"
+-		howllibs="no"
+-	])
++dnl First we attempt to use avahi-compat-howl
++PKG_CHECK_MODULES(HOWL, avahi-compat-howl,
++        [howlincludes="yes" howllibs="yes"],
++        [howlincludes="no" howllibs="no"])
++
++dnl If that fails, autodetect the "real" howl
++if test "$howlincludes" = "no" ; then
++        PKG_CHECK_MODULES(HOWL, howl,
++                [howlincludes="yes" howllibs="yes"],
++                [howlincludes="no" howllibs="no"])
++fi
+ 
+ dnl Override HOWL_CFLAGS if the user specified an include dir
+ if test "$ac_howl_includes" != "no"; then
diff --git a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
index 52e129244a54..26df2930f033 100644
--- a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3-r1.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/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.3 2006/06/30 15:51:09 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.4 2006/07/01 19:16:17 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-module
 
@@ -14,12 +14,13 @@ SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audiofile bonjour cjk dbus debug eds gadu gnutls krb4 mono nas nls perl silc spell startup-notification tcltk xscreensaver custom-flags"
+IUSE="avahi audiofile bonjour cjk dbus debug eds gadu gnutls krb4 meanwhile mono nas nls perl silc spell startup-notification tcltk xscreensaver custom-flags"
 
 RDEPEND="
 	audiofile? ( media-libs/libao
 		media-libs/audiofile )
-	bonjour? ( net-misc/howl )
+	bonjour? ( !avahi? ( net-misc/howl )
+		   avahi? ( net-dns/avahi ) )
 	dbus? ( >=sys-apps/dbus-0.35
 		>=dev-lang/python-2.4 )
 	>=x11-libs/gtk+-2.0
@@ -31,6 +32,7 @@ RDEPEND="
 	gnutls? ( net-libs/gnutls )
 	!gnutls? ( >=dev-libs/nss-3.11
 		>=dev-libs/nspr-4.6.1 )
+	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	eds? ( gnome-extra/evolution-data-server )
 	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
@@ -93,7 +95,7 @@ print_gaim_warning() {
 	ewarn
 	einfo
 	if  use custom-flags; then
-		einfo "Note that you have shown NOT TO FILTER UNSTABLE C[XX]FLAGS."
+		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
 		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-flags"
 		einfo
 	else
@@ -114,6 +116,7 @@ print_gaim_warning() {
 
 pkg_setup() {
 	print_gaim_warning
+
 	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
 	eerror
 	eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
@@ -122,6 +125,14 @@ pkg_setup() {
 	die "Configure failed"
 	fi
 
+	if use avahi && ! built_with_use net-dns/avahi howl-compat ; then
+	eerror
+	eerror You need to rebuild net-dns/avavhi with USE=howl-compat in order
+	eerror to enable howl support for the bonjour protocol in gaim.
+	eerror
+	die "Configure failed"
+	fi
+
 	if use gadu && built_with_use net-libs/libgadu ssl ; then
 	eerror
 	eerror You need to rebuild net-libs/libgadu with USE=-ssl in order
@@ -136,6 +147,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-as-needed.patch
+	epatch ${FILESDIR}/${P}-avahi-compat.patch
 
 	eautomake || die "Failed running eautomake"
 }
@@ -190,6 +202,7 @@ src_compile() {
 		$(use_enable krb4) \
 		$(use_enable debug) \
 		$(use_enable dbus) \
+		$(use_enable meanwhile) \
 		$(use_enable nas) \
 		$(use_enable eds gevolution) \
 		$(use_enable audiofile audio) \