Fix autoipd module location, bug #524788. Thanks Dihan Wickremasuriya.

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

3 files changed, 269 insertions, 15 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 1b563ac1b5be..0d0cca1916cd 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.272 2014/09/07 23:03:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.273 2014/10/09 11:06:14 blueness Exp $
+
+*avahi-0.6.31-r6 (09 Oct 2014)
+
+  09 Oct 2014; Anthony G. Basile <blueness@gentoo.org> +avahi-0.6.31-r6.ebuild:
+  Fix autoipd module location, bug #524788.  Thanks Dihan Wickremasuriya.
 
   07 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
   files/avahi-0.6.31-fix-locale-build.patch:
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index fe296e73f6c9..11002b983a41 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -18,22 +18,23 @@ DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092
 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-r5.ebuild 6339 SHA256 8f5dee9892e5f4062e06730cb0dec0539d1507531f0e5dc20c1edc9d3dd3e790 SHA512 e747759d81363f201ce09b35b2b9243d348f1d7c7b67807f870d50f981b764f0866cbe506463a08501b99b08bc6fa0ee594dabbafdfcc8c7e20952307e1fbcdc WHIRLPOOL 284f2db22c61b68f469fad6a719dd48c2074183d4c1053727577a3aa101a24b53bfeea39eec0c11f9aef2496a4d8da41ec9a812f0fb792f5bbc32f3016fc72bf
-MISC ChangeLog 40683 SHA256 303dc354c0a7d76afdb6a29a1cbbd3d196c9dbb246f82be8351c62e756f55bf1 SHA512 4928e88ed310e334c1fefa2647def093d23d42b09b9d594fa66701caedb9580ae641dffcefa72f10c297ec469980d787b89210816c3cae9e2ad3781b13a64abc WHIRLPOOL aae93302d5d92ec01fed9ce7e75cd9e2da80484f65b6b9321271db515e7da68ada64c6e70efb53f2311c7cc5c90993a27259ca66e10962e07eca13caf349638d
+EBUILD avahi-0.6.31-r6.ebuild 6348 SHA256 2bb4557faf2883c1d41fb59f0fc8f13af8cb7f6ed6017a57a1772b36a68570a4 SHA512 5c6b8dd8b07b0c0881e2620b651f3e33acaea9661a6f29d88fa79f092d5337902b7505cb8ba6da93ce4c1e127cacccec210072b161e6205134181cbff0f3a3b8 WHIRLPOOL e5c5b6305f784715c121b559530686500974b89f55a7178ddf3e90cef9ff8092e9e3af0395206216215050a9b9d58695f1cdc5ccaa463222017655a75fcf5f2f
+MISC ChangeLog 40870 SHA256 98b7814bee41d591143661b29b55691e33953b0b29c87a5101cbb9fd1b1b2a41 SHA512 e1a516134e9efea563a1680b043e84861af79fcefa15863d1c9a1988a27748c419dab348dd4564846832155336feca695c1495bf1803c136ee685add1a272e79 WHIRLPOOL 0c950984dd71673004d234867d48911971a814698c4c86ac7e25a84d0adb0f1d38508398c9d4535963260534aa122cbf5cda730ee5d9fca16f0b573763ca61f0
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUDOTgAAoJEJOE+m71LUu6zygP/06PI93eapDYvg6pYXyvqjAy
-ScZT84KRV9JllBfm79ssDXEj1AVV5X2iDOnCFWiwFX84stpigoQZq/KChM1MgF2Q
-A4ZrbwcPuArW3DaQBQWVy/88HMnEppcviREvaHVGGl5gpR7+BO7SAwGrpzCePdXK
-WvSgyfR10hj8QEzjX47NRSvFC3Y1GDhmbxbp7sfSlpTM7TxtiRU0hTujYtjq3Sl/
-L6nyat46PQ2Nl1BwVSFiB16DFq0qks5JRxYKC4xQYjGeo8D78YEBLl9iynwV0cQD
-Z0vbHOA8HVciMPzzK/WaBIBuuRb/KWs28zBgd6w/lw3QKgobZH08H4d9TsCqYPXm
-lhgc5IZ2EICKAEEaPflxQb5xmcaGeCGnCeE1ry/fMXamyGj3oEu7yZnfF0ylTHcL
-p+NpyaqIQqQc6HHzZem0k7Ic3KqHuQl7XJJ0k3PD3aUUOyWP7EiF/FkYfXrPQZHQ
-yMiL3kFgU9R2Svd6rmCQHIWTNKkp/rFidSOaMOtYaH6ksfKixBXFD7dJJ3DbUFyL
-ZpBvKHq49dsIcxsyMmtXU+fKdsCr7FcXp4fZSkcW1KRQRbaYKfixCS2YjnV2HeqL
-ML5mFMoGMZIfqVROAG4xnAq3dUkmEsZNe0tRr81D3P9f/+9D6Wkiu7zxX+mZfpPt
-1J+Gw4CVoKyT/8v9rKrN
-=7zsS
+iQIcBAEBCAAGBQJUNmxbAAoJEJOE+m71LUu6UtQP/RLtV0IQEtRIKR0cK1MFlxr7
+0cBVUMnPiHznjxsSYv3O/K2Ekp4MYBN9YYyauNdLydXLflsSZ5RBZorePr6+zmic
+X6MqUEH+BB6NlyizIiUhIuK2pxxoiJgsiPN9UHrhfoKvgsFF0u7hJw8Fs41CA50Q
+rr6+eOA575vK247jhhMN1rNwDqdSvOSi5fBhebQyP0NppNj3fpAUo2qX6XhywqAB
+uuT/GoCd4IryedgsejmX9dqzIBIL7nhVz6hyNI/GoQVfHuAsXOcK03puBEYLdsnx
+vLGzgmkUpkutmaUbIe3+NXu4VhGzIElLhTUWxHUaH2W8k0Pfj0OfGlnbzZOEpYnY
+Zn9BS6ZN/dMUCntBw3IR3kJWbKRdL7bLul3n5eHhYylW+XO0LjfqYdyYSglnMEir
+ewr65W7TLW999g/w8tviib73cYWTSqyLmH7+lxMXsRFveEwKfKfKpzCvAOafngqP
+Xok4gMu/Lpz0/DJa0Duf8wN5hE5cgCCE9/E4qpN+CLaBkRwptc0tsbach3Is780e
+AcSVZ6OI3BrHlsWOAxF8VwUXz0NcCfRLzI5/XzQK9S41RR+8P+DCGPnGRqkg65zK
+C2PZqDjeLRNVjPgs08wf3aptjrO7rHZoK533235ltjx4brXDflJqtTFGntcCqR9q
+9dVXj2KVIzLcwCbg2wTv
+=Besw
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild b/net-dns/avahi/avahi-0.6.31-r6.ebuild
new file mode 100644
index 000000000000..91f771206853
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -0,0 +1,248 @@
+# 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-r6.ebuild,v 1.1 2014/10/09 11:06:14 blueness 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 multilib-minimal 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 ~arm64 ~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.34.3:2[${MULTILIB_USEDEP}]
+	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	qt4? ( dev-qt/qtcore:4 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	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-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		app-doc/doxygen
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# necessary until the UI libraries are ported
+	/usr/include/avahi-qt4/qt-watch.h
+	/usr/include/avahi-ui/avahi-ui.h
+)
+
+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
+
+	# allow building client without the daemon
+	epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch
+
+	# Fix build under various locales, bug #501664
+	epatch "${FILESDIR}"/${P}-fix-locale-build.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
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+	use python && python_export_best
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+			$(multilib_native_use_enable gtk pygtk)
+		)
+	fi
+
+	if use mono; then
+		myconf+=( $(multilib_native_use_enable doc monodoc) )
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		--enable-gobject \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable autoipd) \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(multilib_native_use_enable doc doxygen-doc) \
+		$(multilib_native_use_enable mono) \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(multilib_native_use_enable gtk) \
+		$(multilib_native_use_enable gtk3) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable utils gtk-utils) \
+		--disable-qt3 \
+		$(multilib_native_use_enable qt4) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	multilib_is_native_abi && use doc && emake avahi.devhelp
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	use bookmarks && use python && use dbus && use gtk || \
+		rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
+
+	if multilib_is_native_abi && use doc; then
+		dohtml -r doxygen/html/. || die
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp || die
+	fi
+}
+
+multilib_src_install_all() {
+	if use autoipd; then
+		insinto /$(get_libdir)/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /$(get_libdir)/netifrc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	prune_libtool_files --all
+}
+
+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
+}