summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin von Gagern <Martin.vGagern@gmx.net>2010-07-08 12:10:43 +0200
committerMartin von Gagern <Martin.vGagern@gmx.net>2010-07-08 12:10:43 +0200
commit92a4927452ea0cc887c72733ad51ce57f4401c23 (patch)
treea785e38f44dd59bfe28e81e14429f630969ed970 /net-dns
parentaddded p7zip-9.13 with correct desktop files (diff)
downloadkde-sunset-92a4927452ea0cc887c72733ad51ce57f4401c23.tar.gz
kde-sunset-92a4927452ea0cc887c72733ad51ce57f4401c23.tar.bz2
kde-sunset-92a4927452ea0cc887c72733ad51ce57f4401c23.zip
[net-dns/avahi] Update from main portage tree
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/avahi/ChangeLog12
-rw-r--r--net-dns/avahi/Manifest4
-rw-r--r--net-dns/avahi/avahi-0.6.25-r1.ebuild8
3 files changed, 19 insertions, 5 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index a0ae941e..fa410eec 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,16 @@
# 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.177 2010/06/28 08:26:27 phajdan.jr Exp $
+
+ 28 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ avahi-0.6.25-r1.ebuild:
+ x86 stable wrt bug #278177
+
+ 25 Jun 2010; Christoph Mende <angelos@gentoo.org> avahi-0.6.25-r1.ebuild:
+ Stable on amd64 wrt bug #278177
+
+ 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 1c890340..0ae46d31 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -6,7 +6,7 @@ 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 5400 RMD160 f955a49312b3d0b269e08358c1dce3a6ad00f037 SHA1 12f531483b56407b83be6ed2639d79f671c23226 SHA256 8ea2e741aea77123d87ba83f71cdebde92886e8716554916b87a9a79bd67d018
-EBUILD avahi-0.6.25-r1.ebuild 4866 RMD160 ad84c41cae3d7cae4031724eb7689f1f15b9ae30 SHA1 8b65604c02ad5d04968b607de8bf241868be727b SHA256 0bbe2db1ba8453db0f6eae360cc23fd269ce006a83600819284dce1aa3cee97b
+EBUILD avahi-0.6.25-r1.ebuild 5012 RMD160 7957b5fca95a809d35541a75d6ed6c08c9e7c3fd SHA1 5e97c7be346e72e9bc6990547b752563c415e4db SHA256 4503ebb323a83aba185c6db35de5bc0a0debbdae902b4857ff96e38e4c26f60a
EBUILD avahi-0.6.25.ebuild 5352 RMD160 0fb9fe844fba482fbfc95caf8744b71539c55324 SHA1 353f53cbbf73ed27c5b85629fd2e09374f08a251 SHA256 854cb5b236f3109a227970a9aa99904c1f947680a8bef1345c3e98bdc89d0efa
-MISC ChangeLog 26148 RMD160 16a98ad232a0f11404722090fc9c82c3b92bbd10 SHA1 84db8b548895af9047e7ce863d690cc1e620d347 SHA256 8bbd2b087b249db25e6aaaf46107906ca6dacfaba4f1f8f92d62417257fce959
+MISC ChangeLog 26489 RMD160 cc969fa79eeb8f67a435202dc7a6f8567893a2c0 SHA1 736be7d137d639a874a70f629c226e4ab2fae31d SHA256 6e78fd79e78a97f42f48687a0e3f49bd386b654efd6140bc3de633c09d678ef3
MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild
index 798a50ff..6f0b66fe 100644
--- 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.5 2010/06/28 08:26:27 phajdan.jr Exp $
EAPI="3"
+
PYTHON_DEPEND="python? 2"
PYTHON_USE_WITH="gdbm"
PYTHON_USE_WITH_OPT="python"
@@ -15,7 +16,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
RDEPEND=">=dev-libs/libdaemon-0.11-r1
@@ -94,6 +95,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