Add avahi USE flag, bug #172712

Package-Manager: portage-2.1.2.5

4 files changed, 63 insertions, 19 deletions

diff --git a/games-board/ggz-kde-client/ChangeLog b/games-board/ggz-kde-client/ChangeLog
index da661358dfc2..7ab21f25d73b 100644
--- a/games-board/ggz-kde-client/ChangeLog
+++ b/games-board/ggz-kde-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/ggz-kde-client
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ChangeLog,v 1.7 2007/02/22 15:11:34 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ChangeLog,v 1.8 2007/05/01 16:21:47 nyhm Exp $
+
+  01 May 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/ggz-kde-client-0.0.14-howl.patch, ggz-kde-client-0.0.14.ebuild:
+  Add avahi USE flag, bug #172712
 
 *ggz-kde-client-0.0.14 (22 Feb 2007)
 
diff --git a/games-board/ggz-kde-client/Manifest b/games-board/ggz-kde-client/Manifest
index c2ace49b6bf1..2ed938aaa72c 100644
--- a/games-board/ggz-kde-client/Manifest
+++ b/games-board/ggz-kde-client/Manifest
@@ -5,15 +5,19 @@ AUX ggz-kde-client-0.0.14-defines.patch 453 RMD160 9c0a36a7a45467a2569cc5203e3e3
 MD5 0f46bd04e174619cc2872ed44c139fa2 files/ggz-kde-client-0.0.14-defines.patch 453
 RMD160 9c0a36a7a45467a2569cc5203e3e3dfe5b765575 files/ggz-kde-client-0.0.14-defines.patch 453
 SHA256 d2421fc0bb05b012d97aed99d13990734e337bd8b7cfda8f9e94464e6184ebe2 files/ggz-kde-client-0.0.14-defines.patch 453
+AUX ggz-kde-client-0.0.14-howl.patch 591 RMD160 2be8d0746b3cb497bc5db6bb5eb46e59819944b7 SHA1 fd5d87f6aebcd4552e6cf816f6aa082db34fdff3 SHA256 07d37da5ca43a4f42e22aeb695bdc0e8f9f8ec36c20519f761974723203b99b4
+MD5 728d4e1516ed17e4667c1814fe976720 files/ggz-kde-client-0.0.14-howl.patch 591
+RMD160 2be8d0746b3cb497bc5db6bb5eb46e59819944b7 files/ggz-kde-client-0.0.14-howl.patch 591
+SHA256 07d37da5ca43a4f42e22aeb695bdc0e8f9f8ec36c20519f761974723203b99b4 files/ggz-kde-client-0.0.14-howl.patch 591
 DIST ggz-kde-client-0.0.14.tar.gz 1757688 RMD160 4e5d530e26788d2105502b3e6abd60b93230c4af SHA1 04b856659fd87caf60ece360c545128126af02c0 SHA256 ae8d2c3e49109c910765bbe74121dfb6854acd25c9d27ab7463b479c106d1be7
-EBUILD ggz-kde-client-0.0.14.ebuild 680 RMD160 441fa9c3079b734c4305061eab3f729c498a50d5 SHA1 4c2d6987aa7aa3a6efda181a0b2d68661d692ee4 SHA256 a8fb6176b847ff0497cae036d98594a235d8402e1df6a1cc22a79ff539c5b18a
-MD5 ed0f5b66088327096f6e89df4ce4b5d7 ggz-kde-client-0.0.14.ebuild 680
-RMD160 441fa9c3079b734c4305061eab3f729c498a50d5 ggz-kde-client-0.0.14.ebuild 680
-SHA256 a8fb6176b847ff0497cae036d98594a235d8402e1df6a1cc22a79ff539c5b18a ggz-kde-client-0.0.14.ebuild 680
-MISC ChangeLog 1334 RMD160 049bf7ef69d676254d1a3d8d90bf864f175336be SHA1 359662957b81207dcc4210ed627bd388a07a7ff6 SHA256 ae06d2257864df620a16aef998cbf8e07d85b3f1ce004be7c12ee2ad91467ea9
-MD5 e07b9b9dbceb17129c6bd91664db0bec ChangeLog 1334
-RMD160 049bf7ef69d676254d1a3d8d90bf864f175336be ChangeLog 1334
-SHA256 ae06d2257864df620a16aef998cbf8e07d85b3f1ce004be7c12ee2ad91467ea9 ChangeLog 1334
+EBUILD ggz-kde-client-0.0.14.ebuild 927 RMD160 aac9309f8d8530e9a7bbc4fdf24eae13966e34d8 SHA1 d8c0ccefe76861029b8821ec77113f8ab1c4d000 SHA256 2ebb3c1a3d7aef0055d4507696faa651d0543cefdb8d52f0111eb9c7ef76fbea
+MD5 a6a682d977f033e2f8ecab40a6bf2a32 ggz-kde-client-0.0.14.ebuild 927
+RMD160 aac9309f8d8530e9a7bbc4fdf24eae13966e34d8 ggz-kde-client-0.0.14.ebuild 927
+SHA256 2ebb3c1a3d7aef0055d4507696faa651d0543cefdb8d52f0111eb9c7ef76fbea ggz-kde-client-0.0.14.ebuild 927
+MISC ChangeLog 1490 RMD160 815ca498877d7e0252f58f4db1182623df3c7bca SHA1 65c4438144b8368ef09d2c245a1c89ab1099c2d2 SHA256 400e929556c0a26388fdbd82b7d2071fc09136d74fb8772e5c9c3a3cbe18e63e
+MD5 d1032afb75c7a5b40a5b2d63df0b39b5 ChangeLog 1490
+RMD160 815ca498877d7e0252f58f4db1182623df3c7bca ChangeLog 1490
+SHA256 400e929556c0a26388fdbd82b7d2071fc09136d74fb8772e5c9c3a3cbe18e63e ChangeLog 1490
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -22,9 +26,9 @@ MD5 ea228af3975ea0e1cd9b995e633ea5c3 files/digest-ggz-kde-client-0.0.14 268
 RMD160 a9112049a56f7f1d80a8e4cb670528d9af283a27 files/digest-ggz-kde-client-0.0.14 268
 SHA256 17377a7f105016fb9ede31b48b1a207a3bd8778e295d285112771a25a057ab14 files/digest-ggz-kde-client-0.0.14 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF7Vz/dz7hIScOURERAo2RAKDD+1e49cwzGVMSG0YWG8VA2se0ewCcCQeS
-P3JKDj2nyAno6fAGt07rEwk=
-=zOYZ
+iD8DBQFGN2kkdz7hIScOURERAuuBAJ4oKdGY+hjD4nMpOTPx4WfF6cYZdACg2KN/
+KkzT9IvYxIH9+VCxAXhKVx0=
+=0l8J
 -----END PGP SIGNATURE-----
diff --git a/games-board/ggz-kde-client/files/ggz-kde-client-0.0.14-howl.patch b/games-board/ggz-kde-client/files/ggz-kde-client-0.0.14-howl.patch
new file mode 100644
index 000000000000..999edd79c91c
--- /dev/null
+++ b/games-board/ggz-kde-client/files/ggz-kde-client-0.0.14-howl.patch
@@ -0,0 +1,26 @@
+--- configure.ac
++++ configure.ac
+@@ -81,21 +81,16 @@
+ 
+ AC_CHECK_LIB(howl, sw_discovery_init,
+ [
+-	AC_CHECK_HEADERS([howl/howl_config.h],
+-	[
+ 		AC_DEFINE(WITH_HOWL, 1, [Use howl for zeroconf mechanism])
+-		HOWL_INCLUDES="-I/usr/include/howl"
++		HOWL_INCLUDES="-I/usr/include/howl -I/usr/include/avahi-compat-howl"
+ 		LIB_HOWL="-lhowl -lpthread"
+ 		AC_SUBST(HOWL_INCLUDES)
+ 		AC_SUBST(LIB_HOWL)
+ 		AC_C_BIGENDIAN
+-	],
+-	[
+-		AC_MSG_WARN([Zeroconf diabled, libhowl (headers) not found.])
+-	])
+ ],
+ [
+ 	AC_MSG_WARN([Zeroconf disabled, libhowl (libs) not found.])
++	exit 1
+ ],
+ [-lpthread])
+ 
diff --git a/games-board/ggz-kde-client/ggz-kde-client-0.0.14.ebuild b/games-board/ggz-kde-client/ggz-kde-client-0.0.14.ebuild
index 1617472b2824..55ab78454d48 100644
--- a/games-board/ggz-kde-client/ggz-kde-client-0.0.14.ebuild
+++ b/games-board/ggz-kde-client/ggz-kde-client-0.0.14.ebuild
@@ -1,29 +1,39 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ggz-kde-client-0.0.14.ebuild,v 1.2 2007/03/06 12:07:46 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ggz-kde-client-0.0.14.ebuild,v 1.3 2007/05/01 16:21:47 nyhm Exp $
 
-inherit eutils kde-functions games-ggz
+inherit autotools eutils kde-functions games-ggz
 
 DESCRIPTION="The KDE client for GGZ Gaming Zone"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
-IUSE="arts"
+IUSE="arts avahi"
 
 RDEPEND="~dev-games/ggz-client-libs-${PV}
 	virtual/libintl
-	net-misc/howl
-	arts? ( kde-base/arts )"
+	arts? ( kde-base/arts )
+	avahi? ( net-dns/avahi )
+	!avahi? ( net-misc/howl )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 need-kde 3
 
+pkg_setup() {
+	if use avahi && ! built_with_use net-dns/avahi howl-compat ; then
+		die "Please build net-dns/avahi with USE=howl-compat"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-defines.patch
+	epatch \
+		"${FILESDIR}"/${P}-defines.patch \
+		"${FILESDIR}"/${P}-howl.patch
+	eautoconf
 }
 
 src_compile() {