Fix broken intltool rules, bug #319057.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index a0ae941e15975387e42451065f57dbd8b32bf67e..e7278a6c56ba9d5508b72efe7b07a8bd31dec3a5 100644 (file)
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.174 2010/05/19 19:14:47 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.175 2010/06/24 21:13:41 swegener Exp $
+
+  24 Jun 2010; Sven Wegener <swegener@gentoo.org> avahi-0.6.25-r1.ebuild:
+  Fix broken intltool rules, bug #319057.
 
   19 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   avahi-0.6.24-r2.ebuild, avahi-0.6.25.ebuild, avahi-0.6.25-r1.ebuild:

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 1da3ef47a90d662ba5033ba41ea2e3b22311848a..8f43c4cc7cd2bfdedc69bbea708dae6b46f2ab1e 100644 (file)
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.24-CVE-2009-0758.patch 953 RMD160 7c1a2a2082c61d6feb05d985068122133b434b02 SHA1 429347d8b9f9022c5316ce1e5163a68fa7393b4f SHA256 e8a93a705ec07ca6a4c4c7634a97b9b2c5ee0712c9e80767c6bf7e3f4a5d6853
@@ -6,7 +9,14 @@ AUX avahi-0.6.24-libintl.patch 542 RMD160 918aa11cdbce6f38d9a9446c798db2bc43a957
 DIST avahi-0.6.24.tar.gz 1115626 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
 DIST avahi-0.6.25.tar.gz 1103653 RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
 EBUILD avahi-0.6.24-r2.ebuild 5368 RMD160 ffeb883f4fb101cdb9e9ec59d64318f803b01ab8 SHA1 0180b1d944566ec426eb85ab4baa309435c2c4d4 SHA256 47ed3b27556a53fbbf862fb7eb50f96699a4df10d32d74e9e2ac0a0043f2edc8
-EBUILD avahi-0.6.25-r1.ebuild 4834 RMD160 6c6def09fbc2fb3088516ce951213f8dff2d2a46 SHA1 4a1c376080b404e36f0ed5bf9c11416d5d7d3fdf SHA256 d8b8e91774518d29d84fcff53167a030a35d305b2e172784ee3a41834173c80c
+EBUILD avahi-0.6.25-r1.ebuild 4980 RMD160 f6a654f714b24e232a03ac9518b21eb44f3bf0d3 SHA1 80281b36a89ed52f7e7dac234827ed75f1637a04 SHA256 4565e179b80bccf3f0b1162d970235fa09049d9e976d745a80fdbd20f842ac7b
 EBUILD avahi-0.6.25.ebuild 5320 RMD160 c8dc95b5ed53685ae9f6c459dd99ec2309b890cf SHA1 31df3b118b824240ed76b5c36d79d90071650053 SHA256 612a5cac5ecbc42909f84ff3a10b41b090762ca467ed6cd238924e1ee7f84e42
-MISC ChangeLog 26148 RMD160 16a98ad232a0f11404722090fc9c82c3b92bbd10 SHA1 84db8b548895af9047e7ce863d690cc1e620d347 SHA256 8bbd2b087b249db25e6aaaf46107906ca6dacfaba4f1f8f92d62417257fce959
+MISC ChangeLog 26265 RMD160 591653434a0a21aa483c37525f3f11a9431b720e SHA1 e1a9296d5de0574ff999708c891382297ed3258a SHA256 64a7cf23e7725bc95e7a7238f8f672ff6d498f4d57ce5fe1e73e4a5756ac0075
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwjyowACgkQI1lqEGTUzySqtACfU9dsxYu1H7vsritaycr4cuDu
+9OoAoMqeRgoIM6/Ft+fKipyBNW6Gop4L
+=hVnX
+-----END PGP SIGNATURE-----

diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild
index b015abe8ced944cd1ad15c7d19193a66a476c7e3..8e770d34bfef3ac6e835458cbebe50f52687e38e 100644 (file)
--- a/net-dns/avahi/avahi-0.6.25-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.25-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25-r1.ebuild,v 1.2 2010/05/19 19:14:47 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25-r1.ebuild,v 1.3 2010/06/24 21:13:41 swegener Exp $
 
 EAPI="3"
+
 PYTHON_DEPEND="python? 2"
 PYTHON_USE_WITH="gdbm"
 PYTHON_USE_WITH_OPT="python"
@@ -93,6 +94,9 @@ src_prepare() {
 
        sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
 
+       # Fix intltoolize broken file, see GNOME upstream  #577133
+       sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
        rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
 
        epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch