From 6e05cf89abb59f22e7ff10711f4dd4da3c4388c6 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Sun, 25 Dec 2011 10:49:26 +0000 Subject: Fix 395957 again (Portage version: 2.1.10.41/cvs/Linux x86_64) --- net-dns/avahi/ChangeLog | 6 +++++- net-dns/avahi/avahi-0.6.29-r1.ebuild | 6 ++++-- net-dns/avahi/avahi-0.6.30-r2.ebuild | 6 ++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index 18a06f4f3123..c2f38134ed53 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.213 2011/12/25 08:56:42 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.214 2011/12/25 10:49:26 maksbotan Exp $ + + 25 Dec 2011; Maxim Koltsov avahi-0.6.29-r1.ebuild, + avahi-0.6.30-r2.ebuild: + Fix 395957 again 25 Dec 2011; Maxim Koltsov avahi-0.6.29-r1.ebuild, avahi-0.6.30-r2.ebuild: diff --git a/net-dns/avahi/avahi-0.6.29-r1.ebuild b/net-dns/avahi/avahi-0.6.29-r1.ebuild index 6ab2da5ad5fc..aa85b275cdd4 100644 --- a/net-dns/avahi/avahi-0.6.29-r1.ebuild +++ b/net-dns/avahi/avahi-0.6.29-r1.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.29-r1.ebuild,v 1.2 2011/12/25 08:56:42 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29-r1.ebuild,v 1.3 2011/12/25 10:49:26 maksbotan Exp $ EAPI="3" @@ -178,7 +178,9 @@ src_install() { insinto /usr/share/devhelp/books/avahi doins avahi.devhelp || die fi - use python && python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die + if use python; then + python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die + fi } pkg_postrm() { diff --git a/net-dns/avahi/avahi-0.6.30-r2.ebuild b/net-dns/avahi/avahi-0.6.30-r2.ebuild index 0d2ede26f27f..49e6f5eccce8 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.2 2011/12/25 08:56:42 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r2.ebuild,v 1.3 2011/12/25 10:49:26 maksbotan Exp $ EAPI="3" @@ -188,7 +188,9 @@ src_install() { insinto /usr/share/devhelp/books/avahi doins avahi.devhelp || die fi - use python && python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die + if use python; then + python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die + fi # Remove .la files find "${D}" -name '*.la' -exec rm -f {} + || die -- cgit v1.2.3-65-gdbad