diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-16 16:51:09 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-16 16:51:09 +0000 |
commit | 6d5e4fcbe8761fa0bbbe2c8b3cb63040f7401916 (patch) | |
tree | b4c3bb80fedceffd70cf9f49417a53b6e43ec667 /net-dns | |
parent | bump to 9.0 (diff) | |
download | historical-6d5e4fcbe8761fa0bbbe2c8b3cb63040f7401916.tar.gz historical-6d5e4fcbe8761fa0bbbe2c8b3cb63040f7401916.tar.bz2 historical-6d5e4fcbe8761fa0bbbe2c8b3cb63040f7401916.zip |
Remove || die from python_convert_shebangs and run it on a directory instead wrt #396339 by Deepak Shandilya
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'net-dns')
-rw-r--r-- | net-dns/avahi/ChangeLog | 6 | ||||
-rw-r--r-- | net-dns/avahi/Manifest | 18 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.30-r3.ebuild | 10 |
3 files changed, 18 insertions, 16 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index a6f32ba1cf98..d991ede6f730 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.218 2012/01/15 22:23:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.219 2012/01/16 16:51:09 ssuominen Exp $ + + 16 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> avahi-0.6.30-r3.ebuild: + Remove || die from python_convert_shebangs and run it on a directory instead + wrt #396339 by Deepak Shandilya *avahi-0.6.30-r3 (15 Jan 2012) diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index 3bb23696ba19..a3aeab2c0a9e 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -15,17 +15,17 @@ EBUILD avahi-0.6.28-r1.ebuild 4934 RMD160 7ebe1201b97f00f08a330211f8f81b07e3d172 EBUILD avahi-0.6.29-r1.ebuild 5033 RMD160 36152840c393b1f1fe0b9f2ddf1798c3351ac20c SHA1 3f300b970cfd41e2f271f641b3b8f63faff1e83b SHA256 75d38c8792a5556f711cd6f71b454bd91497c9f8f3729211adda29f1b7eb8aff EBUILD avahi-0.6.30-r1.ebuild 5557 RMD160 88d8ccca732abf6f72aae917ef92e0e18962c48a SHA1 dc1e6994c5cd7d351ece55ae9b7a05eff83ee31d SHA256 aa67f0517b2afcda9353c2d7d4f62fe0544605e654823c17c672d7988f622de4 EBUILD avahi-0.6.30-r2.ebuild 5674 RMD160 86e7867114ae6ae0a79b708303f38bfb50a56460 SHA1 6ac7df5c479298cb25f9dc2dbb08cef5c09d1e46 SHA256 9151c0c67540c4e8de22e19f8d4da7db4c4803a66a0f62a75990994678344528 -EBUILD avahi-0.6.30-r3.ebuild 5763 RMD160 ea23c92e48cd3457526fbf8e1095afd6f6d324b0 SHA1 644030505f318d4143c576a94e40f445642dca9f SHA256 571df45331be4cdf4917c1f4d7de528564d078f538166702d2e7b8d8d8f62216 -MISC ChangeLog 32810 RMD160 390a1d029c143e524b0a540af34dd50f48c31023 SHA1 d9459cd23f95ba113044ef7f9f7fd5b0487f67cd SHA256 f19e3628198db8cda5999e37c77f75b03a7bd1a4a4f868d024f7f26ae160c50b +EBUILD avahi-0.6.30-r3.ebuild 5700 RMD160 594c62578cb516220d55c220cc0bfec0e211fe32 SHA1 2396339ce1bb1f712236ed89a7ba14aeb9b37675 SHA256 2bb14c9a6df35ee3e3c1de4af57d77e6b3bc06a5ddb166647d557d07295962de +MISC ChangeLog 33002 RMD160 cc333aedecc2e91cd0daf0ebb3ed08f587258a03 SHA1 133ce6120c33604e01dc3e390b284348d847563b SHA256 3c083e466fce82378948c9306610baa604928d3ad5cd626009cd1b657deb9cc8 MISC metadata.xml 892 RMD160 9bca92d3dc0b1ca1ebb7de98fcb6c414028ce376 SHA1 4c2a8a417838011d8a8027fd097661ab262e7bbc SHA256 37689509fa8cae032b27236bf754a0060a21c79c03faa11630f606996e6062cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPE1IgAAoJEEdUh39IaPFN04sH/2tYrcjiFO1q4y4lMeMITC2I -7w2UnS3esZqJyYEnuj3cSlmDdGu4cOjtjFZv6D9EG+p8Yw0rNhl2BYstiOngbQd/ -RKQ7hKnJm2PItvK7H70sQ1/OtqyfiVqHCzxoYvoubccdncMI7jbOe5/yl5fVbG48 -kh+iCfmeW7YaM6UROJ/RBV4dX0sPRrnU0PcCYY5v6/BDVF8SIroNIEq4olaLiYvv -3MRumS/jbO30pS/C10BlYXpBr5euHY4M/hjk900buXS+y97SuWmHNrLM80qaRkE/ -Kml7R+M45eNLVYdrg8D7ulwhxPvT1/OjBAgOAAmMir+HwtMlt+gU74lPs9Ewp0A= -=zrz1 +iQEcBAEBAgAGBQJPFFUUAAoJEEdUh39IaPFNWz4H/R7nnaxze6TEcU3QoWQgA5TE +zzoJUHNm2ouGXgmmyw/PxXKhnaJrOT4XngHPz8v2PvH4qf2UCFcnzgluR2Rq4EBl +ZrKe2Ziwno+/yobBRwF1eTPsuawRVg9lXYxHdr38nk6NwtuKO2Vy4uCWUUi7gitO +g221II2nWk5aaL110QVvFpiKIwALjvUzphL4Qc+dzlLEvFInE/4CsIGL3oD1y1pH +vh2RxPK+9saGSDBN4CzK9OBvKW1O2bsKkLeguhLqL5oddNeIEllxYex8xbV19C07 +JmGxIpbbe5xuKwJtAvFPrcjgFXPvfPl2gFql+MYX71gnLj+SDSmAEDVyUNDzDoU= +=cVH0 -----END PGP SIGNATURE----- diff --git a/net-dns/avahi/avahi-0.6.30-r3.ebuild b/net-dns/avahi/avahi-0.6.30-r3.ebuild index 880b1d918fbf..fc79b7c412ce 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.1 2012/01/15 22:23:55 ssuominen Exp $ +# $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 $ EAPI="3" @@ -193,12 +193,10 @@ src_install() { insinto /usr/share/devhelp/books/avahi doins avahi.devhelp || die fi - if use python && use gtk && use dbus; then - python_convert_shebangs 2 "${ED}usr/bin/avahi-discover" - fi - # Remove .la files - find "${D}" -name '*.la' -exec rm -f {} + || die + use python && python_convert_shebangs -r 2 "${ED}"/usr/bin #396339 + + find "${ED}" -name '*.la' -exec rm -f {} + } pkg_postrm() { |