Fix 395957 again

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 18a06f4f3123cef6ed113a27fdca5daa8fd24f4f..c2f38134ed5351d044c715b3f45ff3e490e5e4f9 100644 (file)
--- 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 <maksbotan@gentoo.org> avahi-0.6.29-r1.ebuild,
+  avahi-0.6.30-r2.ebuild:
+  Fix 395957 again
 
   25 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> avahi-0.6.29-r1.ebuild,
   avahi-0.6.30-r2.ebuild:

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 6e92cf5dfeb663e382503675d25b59fce814aaee..82b579f7461c076bd7e8bba6e81a680c5db3e56d 100644 (file)
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -8,8 +8,8 @@ DIST avahi-0.6.28.tar.gz 1238660 RMD160 d61b370baa3f25d57efba43f2c34b54cab7e7e9e
 DIST avahi-0.6.29.tar.gz 1244081 RMD160 a0a4e1019cafb53a683ceceaa44605873957b6cd SHA1 af13ae6fdb3cd61b2eafa25a108773156d88b362 SHA256 4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8
 DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-0.6.28-r1.ebuild 4934 RMD160 7ebe1201b97f00f08a330211f8f81b07e3d17250 SHA1 4bc99179361a3a55234dbd6f646ce958bbe96e61 SHA256 fb564902531fd9e2059456b2e4659ac0f66ca6e8c1dc0911b9c7fc1cf6c1eed5
-EBUILD avahi-0.6.29-r1.ebuild 5021 RMD160 54323867a7a3d94622bd616fa6be2e1c68c6e884 SHA1 a5a72ac355c3b697a368e49fb08397162948960b SHA256 d2f42e36a0532060798bbbfe2167647f3cb5fabf6d8ceddc5707fc6bf6efa05f
+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 5646 RMD160 f3ea35aaef24800b082cdc15887b35925032ab5d SHA1 70414217105aa685d0a0608c044ef69503ebad88 SHA256 cbb6700b86a33067345c62b68d78b240078c83eb22b633548856b0ba040ab045
-MISC ChangeLog 31935 RMD160 ad814934bf6cc82213389b71768bf6ae6650942b SHA1 d9894198b9810e16f2dc99c99254cbd6a23422fd SHA256 48456400bc51d9367167e435bdf3f727ac75f35de9eb70f3b57ee7a7a2d2f4fc
+EBUILD avahi-0.6.30-r2.ebuild 5658 RMD160 96a8b78471f531d3388f77097037c165194a7662 SHA1 ab02be71fec772a1f03e5d09b600a34835ecd5bf SHA256 337dd285ee1314eebe1749b09e28d1de0ff95aec4fe4ed93abe9133f2393acde
+MISC ChangeLog 32057 RMD160 4621c5f7258decf079f39c903c22e558a3558dc9 SHA1 18da9b01dcb4950a55354dbf38c501e19258a76f SHA256 11bf9f552bfe22cdb789268304f11aad6863a168385178d057b53b4a235c4674
 MISC metadata.xml 892 RMD160 9bca92d3dc0b1ca1ebb7de98fcb6c414028ce376 SHA1 4c2a8a417838011d8a8027fd097661ab262e7bbc SHA256 37689509fa8cae032b27236bf754a0060a21c79c03faa11630f606996e6062cc

diff --git a/net-dns/avahi/avahi-0.6.29-r1.ebuild b/net-dns/avahi/avahi-0.6.29-r1.ebuild
index 6ab2da5ad5fca1c44a84d9911d9789e752ba0933..aa85b275cdd41fd6b7ed473307ef51479268da13 100644 (file)
--- 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 0d2ede26f27fee3ac401c1802e49d34d46bb4cf8..49e6f5eccce841db4ce125e1bae89f0be6eeb5bc 100644 (file)
--- 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