summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Buchholz <rbu@gentoo.org>2008-08-23 11:49:55 +0000
committerRobert Buchholz <rbu@gentoo.org>2008-08-23 11:49:55 +0000
commit3da602f8447b8fa1734bb1a4a47d14f6d2e1bc3f (patch)
tree64d0b8c3ee316c8b3ef157cf3863c6353ee9c641 /dev-python
parentMarked ppc and ppc64 (diff)
downloadhistorical-3da602f8447b8fa1734bb1a4a47d14f6d2e1bc3f.tar.gz
historical-3da602f8447b8fa1734bb1a4a47d14f6d2e1bc3f.tar.bz2
historical-3da602f8447b8fa1734bb1a4a47d14f6d2e1bc3f.zip
+ 23 Aug 2008; Robert Buchholz <rbu@gentoo.org> 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)
Package-Manager: portage-2.1.5_rc4
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/kaa-base/ChangeLog6
-rw-r--r--dev-python/kaa-base/Manifest4
-rw-r--r--dev-python/kaa-base/kaa-base-0.4.0.ebuild11
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-python/kaa-base/ChangeLog b/dev-python/kaa-base/ChangeLog
index 7b035a98d810..fed5a49f2a49 100644
--- a/dev-python/kaa-base/ChangeLog
+++ b/dev-python/kaa-base/ChangeLog
@@ -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@gentoo.org> 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@gentoo.org> metadata.xml,
kaa-base-0.4.0.ebuild:
diff --git a/dev-python/kaa-base/Manifest b/dev-python/kaa-base/Manifest
index 1ad27f544e9b..fc247294be87 100644
--- a/dev-python/kaa-base/Manifest
+++ b/dev-python/kaa-base/Manifest
@@ -3,6 +3,6 @@ DIST kaa-base-0.3.0.tar.gz 152079 RMD160 ce5636723b0881f01592527aa1e5f00d2fbff58
DIST kaa-base-0.4.0.tar.gz 169848 RMD160 6b07753aae440404d41cc902b3223432238cfd18 SHA1 f9b0af0ffd17d99629f61dea198b4c8004045e53 SHA256 7795e5e1505bb66526c198b78309a2a111135e5d5c679ef713974b71d6580b46
EBUILD kaa-base-0.1.3.ebuild 840 RMD160 9579ebdfa12aaa3a8e1169f3dce696c544260be2 SHA1 63da6d6fb50c24c5727961f2868650426e7add6d SHA256 43596fb5a04ad72b05079350cafdbbbbf271bd63001beaf07b753c09b8317ebf
EBUILD kaa-base-0.3.0.ebuild 944 RMD160 20018c5e411459ba12b062c6b14da6473a50fc59 SHA1 01ffb6fab20fd7c2c1de44a2c40250a6f63b6c05 SHA256 a57ba82d2eb554c91834a54a5102f07e835c494105bc6fa41b355ecb2907a65c
-EBUILD kaa-base-0.4.0.ebuild 1196 RMD160 15cc8e17ae811f6e5519ee1fbec549c7a256c94a SHA1 354350165826ad2d8b9ca4931c89aeb38a6cbb4e SHA256 dc7508fc79e3888d17535c59d0ba3a0abde3577fe9e9003b170fd00ba176a6af
-MISC ChangeLog 1929 RMD160 fec43a35b8ce1ff9d768f75d694f0fe62d76de8a SHA1 ca708d25008e1a90002d42f91952f0695b130060 SHA256 b817dc6498cbd80ddfa2df49c4a007df88461e741e3f3c9ce57fdfde9e9eca45
+EBUILD kaa-base-0.4.0.ebuild 1229 RMD160 72dd6134da4543ee86169eb840389b9fda14cf18 SHA1 c1adaf250539a082a5911cdfe31a53085b7a2bf1 SHA256 9cc0c58b982577be7d7b059dff95e8c5a48a083b3ce5f4a0d3521f6a69607e51
+MISC ChangeLog 2121 RMD160 1c276bddea28d5865d44be739f6c56c063fd2435 SHA1 c71cef7ed85a36a2a553e8d5dfa44dd8940959c2 SHA256 a0bb55fbb711c1e42682cafb9b1649950f98fa4a8d8e8749193a30d4782cc65b
MISC metadata.xml 939 RMD160 564ca451943e3913c6ce83468abd9f4d6c00a85d SHA1 ccead8a2425abb0b3b5db09ef08d5045866cb3dc SHA256 92fa5640ba5a1f8be3de22081645ece1429766f978e641486d663e02cf0b3bb3
diff --git a/dev-python/kaa-base/kaa-base-0.4.0.ebuild b/dev-python/kaa-base/kaa-base-0.4.0.ebuild
index 298fb91904f0..e634eb1c6b14 100644
--- a/dev-python/kaa-base/kaa-base-0.4.0.ebuild
+++ b/dev-python/kaa-base/kaa-base-0.4.0.ebuild
@@ -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 @@ SLOT="0"
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 @@ pkg_setup() {
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