Forgot to prune the patch.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

2 files changed, 20 insertions, 23 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index ab302741972f..3bb23696ba19 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -4,7 +4,7 @@ Hash: SHA1
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.28-CVE-2011-1002.patch 2076 RMD160 0b561a78e75099a14e7a3da5290cd1ffa6a75533 SHA1 6d298861d7c7b432cd350f3df277e43ed59b378b SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97
-AUX avahi-0.6.30-automake-1.11.2.patch 4250 RMD160 2f25b0bba48d7efa07c81fd036c0e9d52f195e10 SHA1 511b3d0d99c56db547a7ca7c3bc2ca6eb2cbfe81 SHA256 0ee3515741f7949932b0cbc9847dbb848b297c9f7a38f1ff17cb0e5ab7f5841c
+AUX avahi-0.6.30-automake-1.11.2.patch 3256 RMD160 35e8343c9bfb98ebdcf3c6b05e082187fb285c2e SHA1 44cf79f51a47dde3d2d2701ca3718aa5744b52a6 SHA256 bcfd79cb5c74c2ec17d7320d9302c6946282b36e306ab16261aec0de590a5423
 AUX avahi-0.6.30-optional-gtk-utils.patch 2422 RMD160 75d049bc187c08b0ad2d76921064c087d57532ed SHA1 99a0ea57a461d0c0b3d4269adc9571d1bf85f31c SHA256 1233ba93af567117091094921e5ba76f205b1d984fd5a97153c2004f8f0509e3
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 RMD160 3b5cda1422345d0fb43842e27dd5b4579ebebd72 SHA1 06450b5cd37b0be3319328706a0329d767219bc5 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc
 AUX netlink-request-all-matches-when-requesting-interface.patch 1634 RMD160 3995e26dca6ec1cb4801159c479c0b591eff5da3 SHA1 e234d6bd96b7adaf543ef7583b6dd90538238608 SHA256 163db2141b278a07433e7d1b51227493555ca7ba1faf2d19c97e20aa51b947cd
@@ -21,11 +21,11 @@ MISC metadata.xml 892 RMD160 9bca92d3dc0b1ca1ebb7de98fcb6c414028ce376 SHA1 4c2a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPE1GXAAoJEEdUh39IaPFNjEUIAIN9rtjtxhXsZXykr/TdASRW
-H+U4XIXmeJz9jgwjxuU6iEEZ7Pk9jciWOASrgQ9WDR+iiTxJwqKnH3Qnrw4xlPdM
-9Fdf8cOp3mweWg4pnPwr7j9Q+EbFHwDB9lX8QmQWVEAcEQ8cqpdt5yhf45XngHXv
-TYqzakwQstQWtAVpYukdcdeSuAmk7GgdAPXPHKCKju0j/RSdircn4yp10ju2xedO
-1Mkq6CamKTaoX2CWG7zQSbQuf9Fwsm20ZDCsfDy8EfCCE8fOEt0saZemJoijEVEl
-/3nSNm+hUXDGPQgrlmpHSgWBs/OtxZ58H2yKR6s67SqYOATqeBVPXZshHSkxC30=
-=81j8
+iQEcBAEBAgAGBQJPE1IgAAoJEEdUh39IaPFN04sH/2tYrcjiFO1q4y4lMeMITC2I
+7w2UnS3esZqJyYEnuj3cSlmDdGu4cOjtjFZv6D9EG+p8Yw0rNhl2BYstiOngbQd/
+RKQ7hKnJm2PItvK7H70sQ1/OtqyfiVqHCzxoYvoubccdncMI7jbOe5/yl5fVbG48
+kh+iCfmeW7YaM6UROJ/RBV4dX0sPRrnU0PcCYY5v6/BDVF8SIroNIEq4olaLiYvv
+3MRumS/jbO30pS/C10BlYXpBr5euHY4M/hjk900buXS+y97SuWmHNrLM80qaRkE/
+Kml7R+M45eNLVYdrg8D7ulwhxPvT1/OjBAgOAAmMir+HwtMlt+gU74lPs9Ewp0A=
+=zrz1
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch b/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch
index 2063972247b4..be385f6cfbe3 100644
--- a/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch
+++ b/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch
@@ -1,6 +1,7 @@
-diff -ur avahi-0.6.30.orig/avahi-python/avahi/Makefile.am avahi-0.6.30/avahi-python/avahi/Makefile.am
---- avahi-0.6.30.orig/avahi-python/avahi/Makefile.am	2010-06-29 06:30:34.000000000 +0300
-+++ avahi-0.6.30/avahi-python/avahi/Makefile.am	2012-01-16 00:07:41.159974487 +0200
+http://bugs.gentoo.org/397477
+
+--- avahi-python/avahi/Makefile.am
++++ avahi-python/avahi/Makefile.am
 @@ -31,7 +31,7 @@
  		-e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \
  		-e 's,@CHECK_KEY\@,while key is not None:,g' \
@@ -19,9 +20,8 @@ diff -ur avahi-0.6.30.orig/avahi-python/avahi/Makefile.am avahi-0.6.30/avahi-pyt
  	chmod +x $@
  endif
  
-diff -ur avahi-0.6.30.orig/avahi-python/avahi/ServiceTypeDatabase.py.in avahi-0.6.30/avahi-python/avahi/ServiceTypeDatabase.py.in
---- avahi-0.6.30.orig/avahi-python/avahi/ServiceTypeDatabase.py.in	2010-06-29 06:30:34.000000000 +0300
-+++ avahi-0.6.30/avahi-python/avahi/ServiceTypeDatabase.py.in	2012-01-16 00:05:13.440986312 +0200
+--- avahi-python/avahi/ServiceTypeDatabase.py.in
++++ avahi-python/avahi/ServiceTypeDatabase.py.in
 @@ -26,7 +26,7 @@
  class ServiceTypeDatabase:
      """ServiceTypeDatabase maps service types to descriptions"""
@@ -31,9 +31,8 @@ diff -ur avahi-0.6.30.orig/avahi-python/avahi/ServiceTypeDatabase.py.in avahi-0.
  
          self.db = @DBM@.open(filename, "r")
  
-diff -ur avahi-0.6.30.orig/avahi-ui/Makefile.am avahi-0.6.30/avahi-ui/Makefile.am
---- avahi-0.6.30.orig/avahi-ui/Makefile.am	2010-06-29 06:30:35.000000000 +0300
-+++ avahi-0.6.30/avahi-ui/Makefile.am	2012-01-16 00:08:41.330969679 +0200
+--- avahi-ui/Makefile.am
++++ avahi-ui/Makefile.am
 @@ -62,18 +62,18 @@
  
  if HAVE_GDBM
@@ -57,9 +56,8 @@ diff -ur avahi-0.6.30.orig/avahi-ui/Makefile.am avahi-0.6.30/avahi-ui/Makefile.a
  endif
  
  bin_PROGRAMS = bssh
-diff -ur avahi-0.6.30.orig/avahi-utils/Makefile.am avahi-0.6.30/avahi-utils/Makefile.am
---- avahi-0.6.30.orig/avahi-utils/Makefile.am	2010-06-29 06:30:35.000000000 +0300
-+++ avahi-0.6.30/avahi-utils/Makefile.am	2012-01-16 00:09:17.816966708 +0200
+--- avahi-utils/Makefile.am
++++ avahi-utils/Makefile.am
 @@ -30,13 +30,13 @@
  
  if HAVE_GDBM
@@ -76,9 +74,8 @@ diff -ur avahi-0.6.30.orig/avahi-utils/Makefile.am avahi-0.6.30/avahi-utils/Make
  endif
  
  avahi_resolve_SOURCES = avahi-resolve.c sigint.c sigint.h
-diff -ur avahi-0.6.30.orig/service-type-database/Makefile.am avahi-0.6.30/service-type-database/Makefile.am
---- avahi-0.6.30.orig/service-type-database/Makefile.am	2010-06-29 06:30:35.000000000 +0300
-+++ avahi-0.6.30/service-type-database/Makefile.am	2012-01-16 00:10:53.704959089 +0200
+--- service-type-database/Makefile.am
++++ service-type-database/Makefile.am
 @@ -18,13 +18,12 @@
  EXTRA_DIST=build-db.in service-types