Fix bug #501664

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 19 insertions, 449 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 62ac19770133..1660d1aec2be 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.267 2014/08/20 17:20:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.268 2014/08/20 17:22:01 blueness Exp $
+
+  20 Aug 2014; Anthony G. Basile <blueness@gentoo.org> -avahi-0.6.31-r3.ebuild,
+  -avahi-0.6.31-r4.ebuild:
+  Fix bug #501664
 
   20 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
   +files/avahi-0.6.31-fix-locale-build.patch, avahi-0.6.31-r5.ebuild:
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index e1ccbf4049e3..9a8120ae36ac 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -17,25 +17,23 @@ DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c399809
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
 EBUILD avahi-0.6.30-r3.ebuild 5804 SHA256 e4fd4ef76c2e6ba2803086500ce095cfd1760f14b8865760b69c8c654ae44fcf SHA512 1fa33ff17ece7b2b79c2615bfbfd2b3a22f4a29d415ce92ce1c41d330df31f6d68f40919264f425a79dce36271ecae3d1461a2a9674193e36e5939ecde952c78 WHIRLPOOL 035a893e3be89534140b1fc797c982e66ae9371b6d1215ca66050e817f633a499c9b924d7749e2d5ce7f760f6c3f0985e47efd4c7bc14031dd60bb89412ebd9c
 EBUILD avahi-0.6.31-r2.ebuild 5173 SHA256 008708915ea5073e8bb58301efc2c3df85cc7327860320d130f3849ca88baecb SHA512 01b5ae7a03e3d0d8e4079515d3adc1b05d032bd7ed6db3b20423ddca7cf54326e1441086515f7cbb7e94d300ce34d5e23d1ba0ecfe5c49eee1af84a82f6f7d42 WHIRLPOOL 2aa4d3410fce721882f28042f334d55ac8950406be5094305955237169b9f61ff8737bda4255cc8c8b70ac1aa6d4d4dcf7e719ab19a65621341b2df6b77d7497
-EBUILD avahi-0.6.31-r3.ebuild 5255 SHA256 c9da5ed88584cdc2e1ef95df1627e09379a283c1a9d2863e3a0804835a11c242 SHA512 0db2f9c94813d165a27918891492f7b48df86689249c0c4b11694d4e63a3bb7e3174f40511a65d74a539b339e22de48ddc57d88ff6c5d4ef467b144907a2b110 WHIRLPOOL 753137e4a338cf224a0de494908b8dcb5d24ca5fbf15f84b2a56601c289248074963e7fd0d8a9b60a37f7ecd27239d259650b6ba4257a2eecfd0edb5029c3764
-EBUILD avahi-0.6.31-r4.ebuild 5334 SHA256 ee5cd08397062bd8190ce172b2c97dae3f41f31659cef17636071c0d737408ad SHA512 6e27172b840f21511a2e5f5d4e5ce9246486419ae7916b8053b5f372ecf36e7f3001847df663aff9cbedac7c33e1e29141fa6cd6bf6e63e21695d5815695b186 WHIRLPOOL 2115631ca7cf538d5cb9a9a94d8cbaabde4ed81fd49c3c515f127fed16c9fdfa8a64f4922abf63f345c49fda9e167456309d31adb6d3a2a83a37de6281d6a97d
 EBUILD avahi-0.6.31-r5.ebuild 6343 SHA256 946ddf3388b66ac5b24317b27a441c91e0da5151d16ef57a0084a041a5ab191f SHA512 d5142ebfb2402e2ee95d988f9775eeb3ec642ab989e99eac8ceeb36d0fd03815b72e49a3cb882b0dad82901dba92c3fba5d2cba77e3bd4672698764425596a36 WHIRLPOOL cc5d03eb4ce00f366d023c24cec79fc921c8f24fed19c622374348ab6aa9838372fb2e1592997e1be1018f41824341b0ad377b53db6b8815eb4ba51f88f37b70
-MISC ChangeLog 40073 SHA256 97fab0cec059a90c673206d05ff83336fa94439311da90c0a6a62de138ba943a SHA512 cd382818e4a2868d992e5a1d6a77f7a907d7515710ea0bb61c36720993a33b621c5615aa1c802bccb9503c0b4ae32e5c447f0aac7d91d41b8352cf603da01a91 WHIRLPOOL 5f016f8e251eea718db18abc345e9e33e02436614de33f74c5011124536bd00ee31064d98a3cae1f6fa6c95acd80a1b0ecd829167cd09fec5c255175d97ad9ee
+MISC ChangeLog 40199 SHA256 07240b14b16bb8216c968d05c5797d065803de34309862705ee86a8c90137208 SHA512 d36fa3784e2bdcf524ca98edbb9168a3f6e000101723007b62ec41d47a765be6a86bf2c7a71e8a0f6085010f845b9a951927fd234b10d17bd1f4a91426288d95 WHIRLPOOL 4a70a885d5c124e2c2edb9a45c8317f46cff8d7209c83b62810aa388e9f497b3fba88be89b3eda8311e78428e0bc29b33e1c5a61c41b3293a17da96dddc37296
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9NlkAAoJEJOE+m71LUu6ZUAP/2vGOmoSq9+hBgI6uc0d8w8N
-kpnqhoF37Kxqg/7PsM0vSjdmLRg+aV3cals4UAVS8xhDzE0aOwpWpzWVAA44FvWy
-JqrWs2xPv7bhSDwqG9EeglJxiTgIQLXvj4mGmayIe7TcQeSWk4Xl2wpQEqGP+rIi
-+f+d19488l15a51ow9gIdKCyFi8OFxEZeOc4yZN2lpm9wPy7jIHJcQWVibTJCqAG
-2Ca88i1zALv9iUw8upaXXQ8h3SfcKfaLxD4EB7ctQygXKAmtCvXji+bDqM5Qt0QX
-HB0YO0D/xGY7vqw1qduPW+R0i1FcV/FuEueVH4BK4boB7tbcwNU9KM0wpEygsiGm
-Qwr9jcGeBosc42nzc4NDCqn+fvKGjSVOlI8IXmQ5+jQRIApnlwwAhiojaLNCr4O6
-9mMj52whUrjCdVekunZ61KNehQNPOfls8fC8QVlwiBScQTouL4m59xFbKPTfa8d1
-RafUHvG4BGZ3JPt/t26w0xKLK9Zp+0diOeONMs8KCsdM83YulmL9DsTIyhAWGYgZ
-n5Re8p4vJqog4Cguw82Osai6AG4qTT0u5KGDtukwQi/HQPJhnJCewZI6gPGSgLhZ
-l3jAXPmurWq6jzBCGOMlEkTp3Qy7cfvjOmM8K13QEK0sSqsHSDucBjPUEtIItfhK
-1EYyJrE9FGI+ltofec0a
-=NUP9
+iQIcBAEBCAAGBQJT9NnPAAoJEJOE+m71LUu6+3cP/jhU8/ColbDSw7eCEu2/rHCZ
+EO+aXUR50tXI4w7PrBKRUj6CdV6txUcpZYTC26zBfqD1v0nuHK7tg6aw02umReON
+BbY4TzNTgXpc1FsM1urdz5rcXvQYzRyn5km2vTp6/dfdJI1bAPmbCM87AkGcs/s9
+qSS7jJwXHqUZq4aiK6zykGcMfErCcS2ynQv5fPadhlNs6TEwsOlh1m073EAmosNo
+bteFBkWiGRDu+8qmlN9QKRrD78X+LvyQ2z18UMn+FTznwVJYHad+rsjsI+JYYPPA
+o78RGB0uV9y++kOewhTPoHW6SrdbnaJJDEtB2ZM18wQY6CVk4bq7zWInbK3ZMwYV
+4yNKhdKAGsTms4hd5GGi4qNcJX8L3MqS3y2urvGWW8GScDb5w+zG10dLeo9q4j1D
+s31ElHVBDkk1jko6Vq57fuCNNs+xExO7DaQVXDeofAnHlZSALRHax2zE9sARyQZx
+T8TwSfAvqteysIIRdqEa002fB8vBHyStABGNqWlAXAd12EXOH0iLL7jiPgE1aHEa
+410H/aryYZankcWwwCl8JH7ytu51ARdYWF64CnjCB9jcvr1MJS6Z7WA9aSrDnGf6
+QxfqqvhCPAE4EZMP5uG66DqvlM0YLxGK6HWNjtfaYyM/mtWhoSwlITMbY+AGZO+E
+PsRNlSy4rig2i/ivboQs
+=CkJA
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.31-r3.ebuild b/net-dns/avahi/avahi-0.6.31-r3.ebuild
deleted file mode 100644
index 1b4db8530cee..000000000000
--- a/net-dns/avahi/avahi-0.6.31-r3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r3.ebuild,v 1.3 2014/05/16 18:53:22 swift Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib mono-env python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? ( sys-apps/dbus )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	selinux? ( sec-policy/selinux-avahi )
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Backport host-name-from-machine-id patch, bug #466134
-	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Fix references to Lennart's home directory, bug #466210
-	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		python_export_best
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	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
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.31-r4.ebuild b/net-dns/avahi/avahi-0.6.31-r4.ebuild
deleted file mode 100644
index bf0bf897ae19..000000000000
--- a/net-dns/avahi/avahi-0.6.31-r4.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r4.ebuild,v 1.2 2014/05/16 18:53:22 swift Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib mono-env python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? ( sys-apps/dbus )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	selinux? ( sec-policy/selinux-avahi )
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Backport host-name-from-machine-id patch, bug #466134
-	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
-
-	epatch "${FILESDIR}"/${P}-so_reuseport-may-not-exist-in-running-kernel.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Fix references to Lennart's home directory, bug #466210
-	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		python_export_best
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	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
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}