Fix for prefix and add ~x86-linux keyword.

Package-Manager: portage-2.2.0_alpha50_p4/cvs/Linux i686

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index b188d09f87124b5f805fa7dc74edc0c93e9dee7c..7860413997185f1225e688a5664c373356d968b8 100644 (file)
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,9 @@
 # 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.203 2011/04/06 20:09:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.204 2011/08/06 09:41:21 zmedico Exp $
+
+  06 Aug 2011; Zac Medico <zmedico@gentoo.org> avahi-0.6.30.ebuild:
+  Fix for prefix and add ~x86-linux keyword.
 
 *avahi-0.6.30 (06 Apr 2011)
 

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 6172146dbee7a055b3e45325da0ddd0513687958..db357495bf30864d52d5cbfa8a0b3f352f271ce2 100644 (file)
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -10,13 +10,13 @@ DIST avahi-0.6.29.tar.gz 1244081 RMD160 a0a4e1019cafb53a683ceceaa44605873957b6cd
 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.ebuild 4813 RMD160 b9f7a58b8fd051d9c6702d0e2ed01548d26d9edc SHA1 932b31e959caa23f2e58fb8c1beb4da9b8f9dbe8 SHA256 d260d87b5571792264b9ecaa6832bfec5694b40c3199978c4f3385101e6debac
-EBUILD avahi-0.6.30.ebuild 4813 RMD160 7a98702c69e7ef57eb5bdab23d65a97ba36f4e93 SHA1 8431090a119c276cc99135723608a5126123f7e6 SHA256 cde6ab1fe8b734c9f8f9a7b4818b49b76bfe274cdcd87a967be48e0312f9f862
-MISC ChangeLog 30279 RMD160 575e487cf5d83628f96f6a6bd76a9d6078a0eac7 SHA1 8368e88a82a8ca40fb4942969deefcb656e21ebb SHA256 56973afc8ffd97c84e73451f33dfb6280bbf1c149ae610cd11a8069b99b8435f
+EBUILD avahi-0.6.30.ebuild 4838 RMD160 838bcfbe3a24b7aa662e63ab03bf78ae5e9f655f SHA1 934c4b6e8fb70815bc245ac8895f305ba4f68da2 SHA256 19793b5f8a709f9c22c93047eca9271bc83a20fe47f168d7823fc644e82fb747
+MISC ChangeLog 30392 RMD160 74f3bcb750270e3858c20e3b1b13997028a538c1 SHA1 3d6efa3e56c1936b198ede9630510822a540ffae SHA256 fab317afcc49be7ce2d461d0128fd74a48deb67ba035bd4c7ae48a644d40f4d0
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2cyI8ACgkQI1lqEGTUzyQBBACeI2VzzZXkdRDKw7WXjByOpB+D
-3roAoJ2KVdo3IwauwK7US2H4s7nnvKWP
-=DGE7
+iEYEARECAAYFAk49DEcACgkQ/ejvha5XGaMDHwCfUdbvqhfRGJB9kOAffGQsGKdQ
+srgAoPOg4KyJCohqaRtephxw15xFOnR3
+=Wm+n
 -----END PGP SIGNATURE-----

diff --git a/net-dns/avahi/avahi-0.6.30.ebuild b/net-dns/avahi/avahi-0.6.30.ebuild
index 77fcff1262aff78de3ae857960c1dae0852cdd5c..5476c62699eaf2c640c97879c01f16af88e0fb1e 100644 (file)
--- a/net-dns/avahi/avahi-0.6.30.ebuild
+++ b/net-dns/avahi/avahi-0.6.30.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.ebuild,v 1.1 2011/04/06 20:09:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30.ebuild,v 1.2 2011/08/06 09:41:21 zmedico Exp $
 
 EAPI="3"
 
@@ -16,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 ~x86-linux"
 IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt4 test "
 
 DBUS_DEPEND=">=sys-apps/dbus-0.30"
@@ -122,7 +122,7 @@ src_configure() {
        # >=gobject-introspection-0.9, so we disable introspection for now.
        # http://avahi.org/ticket/318
        econf \
-               --localstatedir=/var \
+               --localstatedir="${EPREFIX}/var" \
                --with-distro=gentoo \
                --disable-python-dbus \
                --disable-pygtk \
@@ -155,10 +155,10 @@ src_compile() {
 src_install() {
        emake install py_compile=true DESTDIR="${D}" || die "make install failed"
        use bookmarks && use python && use dbus && use gtk || \
-               rm -f "${D}"/usr/bin/avahi-bookmarks
+               rm -f "${ED}"/usr/bin/avahi-bookmarks
 
-       use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
-       use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
+       use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
+       use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
 
        if use autoipd; then
                insinto /$(get_libdir)/rcscripts/net