diff options
author | Mike Gilbert <floppym@gentoo.org> | 2012-02-12 18:55:26 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-12 18:55:26 +0000 |
commit | 45c82cca033bfad732fa4572fbf45423777014d1 (patch) | |
tree | 880048e80d9f86469a9d0d5827c3f51800d05e56 /net-dns/avahi | |
parent | Version bump. (diff) | |
download | gentoo-2-45c82cca033bfad732fa4572fbf45423777014d1.tar.gz gentoo-2-45c82cca033bfad732fa4572fbf45423777014d1.tar.bz2 gentoo-2-45c82cca033bfad732fa4572fbf45423777014d1.zip |
Call python_convert_shebangs() only in correct combination of USE flags. Patch by Arfrever.
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'net-dns/avahi')
-rw-r--r-- | net-dns/avahi/ChangeLog | 6 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.30-r3.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index 28214ff7b300..2d6dffc838ed 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/avahi # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.221 2012/01/16 16:55:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.222 2012/02/12 18:55:26 floppym Exp $ + + 12 Feb 2012; Mike Gilbert <floppym@gentoo.org> avahi-0.6.30-r3.ebuild: + Call python_convert_shebangs() only in correct combination of USE flags. Patch + by Arfrever. 16 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -avahi-0.6.28-r1.ebuild, -files/avahi-0.6.28-CVE-2011-1002.patch, -avahi-0.6.29-r1.ebuild, diff --git a/net-dns/avahi/avahi-0.6.30-r3.ebuild b/net-dns/avahi/avahi-0.6.30-r3.ebuild index fc79b7c412ce..e280ff387ccc 100644 --- a/net-dns/avahi/avahi-0.6.30-r3.ebuild +++ b/net-dns/avahi/avahi-0.6.30-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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-r3.ebuild,v 1.2 2012/01/16 16:51:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.3 2012/02/12 18:55:26 floppym Exp $ EAPI="3" @@ -194,7 +194,9 @@ src_install() { doins avahi.devhelp || die fi - use python && python_convert_shebangs -r 2 "${ED}"/usr/bin #396339 + # /usr/bin/avahi-bookmarks is installed only with USE="bookmarks dbus gtk python". + # /usr/bin/avahi-discover is installed only with USE="dbus gtk python". + use dbus && use gtk && use python && python_convert_shebangs -r 2 "${ED}usr/bin" find "${ED}" -name '*.la' -exec rm -f {} + } |