[gentoo-commits] gentoo-x86 commit in dev-python/kaa-base: ChangeLog kaa-base-0.4.0.ebuild

[Robert Buchholz (rbu)]

rbu         08/08/23 11:49:55

  Modified:             ChangeLog kaa-base-0.4.0.ebuild
  Log:
  +  23 Aug 2008; Robert Buchholz <rbu@g.o> kaa-base-0.4.0.ebuild:+  Pull avahi and others into DEPEND, and check for avahi before checking for+  use flags (bug #235123 by Anton Romanov)
  (Portage version: 2.1.5_rc4)

Revision  Changes    Path
1.15                 dev-python/kaa-base/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/kaa-base/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/kaa-base/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/kaa-base/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/kaa-base/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	16 Aug 2008 15:36:49 -0000	1.14
+++ ChangeLog	23 Aug 2008 11:49:55 -0000	1.15
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/kaa-base
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/ChangeLog,v 1.14 2008/08/16 15:36:49 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/ChangeLog,v 1.15 2008/08/23 11:49:55 rbu Exp $
+
+  23 Aug 2008; Robert Buchholz <rbu@g.o> kaa-base-0.4.0.ebuild:
+  Pull avahi and others into DEPEND, and check for avahi before checking for
+  use flags (bug #235123 by Anton Romanov)
 
   16 Aug 2008; Robert Buchholz <rbu@g.o> metadata.xml,
   kaa-base-0.4.0.ebuild:



1.5                  dev-python/kaa-base/kaa-base-0.4.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/kaa-base/kaa-base-0.4.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/kaa-base/kaa-base-0.4.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/kaa-base/kaa-base-0.4.0.ebuild?r1=1.4&r2=1.5

Index: kaa-base-0.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/kaa-base/kaa-base-0.4.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kaa-base-0.4.0.ebuild	16 Aug 2008 15:38:17 -0000	1.4
+++ kaa-base-0.4.0.ebuild	23 Aug 2008 11:49:55 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/kaa-base-0.4.0.ebuild,v 1.4 2008/08/16 15:38:17 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/kaa-base-0.4.0.ebuild,v 1.5 2008/08/23 11:49:55 rbu Exp $
 
 inherit python eutils distutils
 
@@ -13,11 +13,12 @@
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="avahi ssl sqlite tls lirc"
 
-RDEPEND="dev-libs/libxml2
+DEPEND="dev-libs/libxml2
+	sqlite? ( dev-python/dbus-python >=dev-python/pysqlite-2.2 )
+	avahi? ( net-dns/avahi )"
+RDEPEND="${DEPEND}
 	dev-python/pynotifier
-	avahi? ( net-dns/avahi )
 	lirc? ( dev-python/pylirc )
-	sqlite? ( >=dev-libs/glib-2.4.0 >=dev-python/pysqlite-2.2 )
 	tls? ( dev-python/tlslite )"
 
 PYTHON_MODNAME="kaa"
@@ -34,7 +35,7 @@
 		eerror "dev-libs/libxml2 must be built with the 'python' USE flag"
 		die "Recompile dev-libs/libxml2 with the 'python' USE flag enabled"
 	fi
-	if ! built_with_use net-dns/avahi python; then
+	if use avahi && ! built_with_use net-dns/avahi python; then
 		eerror "net-dns/avahi must be built with the 'python' USE flag"
 		die "Recompile net-dns/avahi with the 'python' USE flag enabled"
 	fi