summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-12-28 17:50:21 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-12-28 17:50:21 +0000
commit8d4767d270393a22a3dd9f4fd033ecbece5db7df (patch)
tree154fda5551fae9ebd82e01cb3e3bfd2199739211 /net-dns/avahi
parentStable for AMD64, wrt bug #333471 (diff)
downloadhistorical-8d4767d270393a22a3dd9f4fd033ecbece5db7df.tar.gz
historical-8d4767d270393a22a3dd9f4fd033ecbece5db7df.tar.bz2
historical-8d4767d270393a22a3dd9f4fd033ecbece5db7df.zip
QA: do not try to convert the shebang of avahi-discover if gtk and/or dbus are disabled.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'net-dns/avahi')
-rw-r--r--net-dns/avahi/ChangeLog6
-rw-r--r--net-dns/avahi/Manifest12
-rw-r--r--net-dns/avahi/avahi-0.6.30-r2.ebuild4
3 files changed, 13 insertions, 9 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 91195f5a4bba..0898921f46b6 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dns/avahi
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.215 2011/12/27 23:55:16 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.216 2011/12/28 17:50:21 flameeyes Exp $
+
+ 28 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> avahi-0.6.30-r2.ebuild:
+ QA: do not try to convert the shebang of avahi-discover if gtk and/or dbus are
+ disabled.
27 Dec 2011; Jesus Rivero <neurogeek@gentoo.org> avahi-0.6.30-r2.ebuild:
Removed die from python_convert_shebangs. Patch by Arfrever
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index d9de37930f34..46bfdb49b748 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -13,13 +13,13 @@ DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1
EBUILD avahi-0.6.28-r1.ebuild 4934 RMD160 7ebe1201b97f00f08a330211f8f81b07e3d17250 SHA1 4bc99179361a3a55234dbd6f646ce958bbe96e61 SHA256 fb564902531fd9e2059456b2e4659ac0f66ca6e8c1dc0911b9c7fc1cf6c1eed5
EBUILD avahi-0.6.29-r1.ebuild 5033 RMD160 36152840c393b1f1fe0b9f2ddf1798c3351ac20c SHA1 3f300b970cfd41e2f271f641b3b8f63faff1e83b SHA256 75d38c8792a5556f711cd6f71b454bd91497c9f8f3729211adda29f1b7eb8aff
EBUILD avahi-0.6.30-r1.ebuild 5561 RMD160 9198ae62b310834296631b3c9dc8cfd082bac722 SHA1 f74536399f5fddfd9d4ae305622b44c163d77a35 SHA256 bb381e2c8ce8b580e28d1f58c1f5f723a2a47219d606308f2a4f2eaa718ffd0c
-EBUILD avahi-0.6.30-r2.ebuild 5651 RMD160 dd9e64512dd45387b5f162789e4222f2a320385f SHA1 0d42219951801a52c2e535b3702807dc4b20394d SHA256 8db2fedc5141dcdc0ce182079b3e9a7c9e2e5cf9b93133ea26a446594a195083
-MISC ChangeLog 32195 RMD160 04f433adb434bc9e397a4be0c427a1f9f44117a3 SHA1 aa928df93e09a4b00a635efb827ae39711a9c5bc SHA256 88b9952fe822cf2a06b99929df0833362a34eb342dc66ada44860ed7d5db82c4
+EBUILD avahi-0.6.30-r2.ebuild 5674 RMD160 86e7867114ae6ae0a79b708303f38bfb50a56460 SHA1 6ac7df5c479298cb25f9dc2dbb08cef5c09d1e46 SHA256 9151c0c67540c4e8de22e19f8d4da7db4c4803a66a0f62a75990994678344528
+MISC ChangeLog 32369 RMD160 d42ea97018e479222cb3e9621b25646346a9e5e3 SHA1 7c07d131a5ca28dbab5dc59e936ab722d6fc957b SHA256 eeb361dbc5297acc2a0b3077247d6118d0d3fab29ca9a7c4bf236ca285b585f8
MISC metadata.xml 892 RMD160 9bca92d3dc0b1ca1ebb7de98fcb6c414028ce376 SHA1 4c2a8a417838011d8a8027fd097661ab262e7bbc SHA256 37689509fa8cae032b27236bf754a0060a21c79c03faa11630f606996e6062cc
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk76WyIACgkQdIssYB9vBoPh+QCfUWbkb2tjueFXnNKuJ7FZ6tyx
-1tMAn09Lth5sbGw9O4C08tcyErC7nRZk
-=Dmbv
+iEYEARECAAYFAk77VqUACgkQAiZjviIA2XiIdACffayVZxitHyuWuCgNcoUrgAbY
+X0wAoOoaW/dFAuNvc/Kq6Jklldw/G2Np
+=hlq/
-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.30-r2.ebuild b/net-dns/avahi/avahi-0.6.30-r2.ebuild
index bf6397689cdf..4681902bf918 100644
--- a/net-dns/avahi/avahi-0.6.30-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r2.ebuild,v 1.4 2011/12/27 23:55:16 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r2.ebuild,v 1.5 2011/12/28 17:50:21 flameeyes Exp $
EAPI="3"
@@ -188,7 +188,7 @@ src_install() {
insinto /usr/share/devhelp/books/avahi
doins avahi.devhelp || die
fi
- if use python; then
+ if use python && use gtk && use dbus; then
python_convert_shebangs 2 "${ED}usr/bin/avahi-discover"
fi