Only enable python support, if we also want dbus support, bug #104081. Use anydbm instead of dbm for creating service-types.db.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 62 insertions, 13 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 4e41c935d876..da00842b4eac 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.5 2005/08/28 22:04:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.6 2005/08/29 01:52:25 swegener Exp $
+
+  29 Aug 2005; Sven Wegener <swegener@gentoo.org> +files/0.2-anydbm.patch,
+  avahi-0.2.ebuild:
+  Only enable python support, if we also want dbus support, bug #104081. Use
+  anydbm instead of dbm for creating service-types.db.
 
 *avahi-0.2 (28 Aug 2005)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 3fd1bd14b779..3761cdc567bb 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff4217ead0b5114dd3e5ec04955f7403 ChangeLog 810
-MD5 b2079e0feb4fc8974c12024c71bbc894 avahi-0.2.ebuild 1217
+MD5 d220a81d95f189f20432e4b30eb2a8cb ChangeLog 1038
+MD5 75d72e0fc57a61cb852cb638df1ff0d1 avahi-0.2.ebuild 1411
+MD5 cf245c4487689f43081e9e25adeb1311 files/0.2-anydbm.patch 622
 MD5 80aecdb4dc5fed13ee581f9965185cdf files/digest-avahi-0.2 61
 MD5 e522a390cede4510e8dbd0446e695912 metadata.xml 297
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDEj+mI1lqEGTUzyQRAnzVAJ9+MIC+cW0BOgn1JoEHPAAxNiZQ7QCcDdqh
-4biGp8VjFshEvCzGMyS5h5o=
-=9pw4
+iD8DBQFDEmprI1lqEGTUzyQRAhD/AJ4gd2jisbgLZ8fdyrgcmz8HwV6vdQCg2HwS
+PFbCOWMktVs6flLhjyXZ/7g=
+=chc2
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.2.ebuild b/net-dns/avahi/avahi-0.2.ebuild
index 5351f7859ab1..6275abc8450e 100644
--- a/net-dns/avahi/avahi-0.2.ebuild
+++ b/net-dns/avahi/avahi-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.2.ebuild,v 1.2 2005/08/28 22:50:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.2.ebuild,v 1.3 2005/08/29 01:52:25 swegener Exp $
 
 inherit eutils
 
@@ -20,11 +20,13 @@ RDEPEND="dev-libs/libdaemon
 		>=gnome-base/libglade-2
 		>=dev-libs/glib-2
 	)
-	python? (
-		>=virtual/python-2.4
-		>=dev-python/pygtk-2
-	)
-	dbus? ( >=sys-apps/dbus-0.30 )"
+	dbus? (
+		>=sys-apps/dbus-0.30
+		python? (
+			>=virtual/python-2.4
+			>=dev-python/pygtk-2
+		)
+	)"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
@@ -33,16 +35,31 @@ pkg_setup() {
 	enewuser avahi -1 -1 -1 avahi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-anydbm.patch
+}
+
 src_compile() {
+	local myconf=""
+
+	if use python && use dbus
+	then
+		myconf="${myconf} --enable-python"
+	fi
+
 	econf \
 		--localstatedir=/var \
 		--with-distro=gentoo \
 		--disable-xmltoman \
+		--disable-python \
 		$(use_enable doc doxygen-doc) \
-		$(use_enable python) \
 		$(use_enable dbus) \
 		$(use_enable gtk) \
 		$(use_enable gtk glib) \
+		${myconf} \
 		|| die "econf failed"
 	emake -j1 || die "emake failed"
 }
diff --git a/net-dns/avahi/files/0.2-anydbm.patch b/net-dns/avahi/files/0.2-anydbm.patch
new file mode 100644
index 000000000000..a07bc5d943bd
--- /dev/null
+++ b/net-dns/avahi/files/0.2-anydbm.patch
@@ -0,0 +1,26 @@
+Index: service-type-database/build-db.in
+===================================================================
+--- service-type-database/build-db.in	(revision 489)
++++ service-type-database/build-db.in	(working copy)
+@@ -19,7 +19,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-import dbm, sys
++import anydbm, sys
+ 
+ if len(sys.argv) > 1:
+     infn = sys.argv[1]
+@@ -31,11 +31,8 @@
+ else:
+     outfn = infn
+ 
+-if outfn.endswith(".db"):
+-    outfn = outfn[:-3]
++db = anydbm.open(outfn, "n")
+ 
+-db = dbm.open(outfn, "n")
+-
+ for ln in file(infn, "r"):
+     ln = ln.strip(" \r\n\t")
+