Enable remaining multilib deps (UI libraries), bug #510182.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 265 insertions, 15 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 220f6c5fd7a6..c89ebbeb8466 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.281 2014/11/02 08:55:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.282 2014/11/22 23:32:32 mgorny Exp $
+
+*avahi-0.6.31-r7 (22 Nov 2014)
+
+  22 Nov 2014; Michał Górny <mgorny@gentoo.org> +avahi-0.6.31-r7.ebuild:
+  Enable remaining multilib deps (UI libraries), bug #510182.
 
   02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> avahi-0.6.31-r6.ebuild:
   Stable for alpha, wrt bug #520338
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 2d52630552b0..7469141da491 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -19,22 +19,25 @@ EBUILD avahi-0.6.30-r3.ebuild 5804 SHA256 e4fd4ef76c2e6ba2803086500ce095cfd1760f
 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
 EBUILD avahi-0.6.31-r6.ebuild 6334 SHA256 ef4994af6a430f7dac828149eee1af2bf045d0cd6024b3ed6a7c377d5efee856 SHA512 ee44cf4f6fdf34d1769c08d3ac16ae0e236a2e739b01b4df4069e04a24d40bf831c974683c01bc8e407be426ad9ddd9f69c446d600b9000f36d83644c2666656 WHIRLPOOL 5adffd87db3c3d14c3e8e711b79a9ee3762d8f3eff5c1bd74b0b7cace5e82d7b8ab364b45063eeda1a79afd1b516f93e8db82b19152c3f45c768926f22d2b9e7
-MISC ChangeLog 41781 SHA256 5a0aab73d3c7f0022b85978b3908b7516d9a2427c1f83fbf3c7d4b18faf99026 SHA512 b6c03e49eb18ace0a9a0cafe6dabfbbd9ee0c3d1fe4990e1856dca3fdbfc7358d8500df47670d128d4c44000989b63343947a50b37561b2ed811501419ac45e8 WHIRLPOOL b8a4f1f6c1fffa8851aa1a6beb4889de4bb1634ba36e78d99946c4a130c28cf06bc0d3932bbde981e951c61e5343cf2f670609d1120c1b628620b5bc3cec2474
+EBUILD avahi-0.6.31-r7.ebuild 6200 SHA256 f341cb94e5886bfe77c101d347e42104011a7eb0f71fb7a8ba101b0bd6b54980 SHA512 b470a0b8f52d12e697aca426c7411c8734a93bd2908dcce908ad55f090dd4f35ecb332c26ac8e0aedcf1940aaeb8a7385eedab256576175ac59bfbc9fdaf2f77 WHIRLPOOL bfafb6fb2fd1ae97d1c11ce3d0793b8b99ebdafdcaa1a6d8c7d09b5a673754ad1f956c5293b84df86ce2908d3b8d6f1de2c427c4cbdc5da2b09ce9dcad9fafe9
+MISC ChangeLog 41954 SHA256 fc16079c4c064c7bcafa07015c94fadd81880fc6c8f16e4cdeccbf49a6c29b3e SHA512 bb992c48487f37980a902095e1d4a56e61cd44b709d53affd2a60ad641454ef865780fe5e30eeb0e6c82e87ab8364142ff2fb8e53d6bc1426642b937db87bdd2 WHIRLPOOL 1b697dc13c4c9719d50f64dbe63ad29230372d101c26d5d2fa5b6d40b2fef51b096fbebbe06e3fb737cc6ac57c8dbf45b3f40f7a31050b3306c932b787a1a7e8
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVfGKAAoJELp701BxlEWfcvIP/3FgMIUJeKdjGC4yrtlSxXIM
-YT0HWvEb4RKen851DX+q0p8PAhQcqLLg8JqWRblLxvKNphZA7mq5zGcTH6FZJ1Fw
-x0lNTH1MsvmiZUWZVnWJRuWJwRTWKfQvVMcWA3jlYOaD6T/WRiMzg7HyqM1HFZ38
-iNJwcGmxPKE/A4W7UEv0UhdzJmaaBCE5hywMCZnFy+jtieGKGcP9CyDWST7dz6kP
-Uk+86GMHwyMszpRVvX4ZUmhOOL8qcWp7vUVs8dI793K6BJ1Wt5oTtvt2OffI6zWw
-4ymSdsq8iMphGiPqZOVOHcmyBP7w+COLAtw2SBL3zWPSc7xQjJFb6Lce2yVXo+Hz
-hWVpjoHRckUGKFwtSeLwescf/nd98HRbwlhrbQZDokdsoDGnUquKtYDtacOpyybY
-raO9KqpP0P3jftkphAqQg/vvJgp6TILFbTaxj8NrNy9g4emByTDhpAK666+VT1XB
-sd3XXvJq+vQ3l0x+VP2xu7qOB6hOZz+leupUDNfV9SAsEnex/ydxAExhbQ1cq/Ra
-uMu87j5WPC3O/Zwtrra/ugkBnVivht4/5B7av4bnEosM7l4nxmthVIZ+zUaFLorS
-PnAyWvHxOTpEKXWT7SE//j+1YnVCQY37/Tc+MdYipmhqapPJoYJksqFOafdmrV0/
-Z1Gc3EmWtgcRwSN6cpe5
-=nnqI
+iQJ8BAEBCABmBQJUcR0RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOniMP/3hpYQaVOnMb4FdY620K7uEk
+qwC+WGL//l2y4cVXZ34B885OtbL8eOYVJ9hkYy+ZklUUQGuugWkwePLv6ysCrR50
++GGc/lW0i44SopxMBM1F8SfuatrKrPQJXaCvWnvabFWO9BxslQDL3oVlmjn3eMj2
+svqKoqhGbH08ni0azzMa+NT8OU/lHMOIVQNNjTbLHSrqhDFelHp8UD7VEzufTfKs
+4Fx0eXJPCkDUXDrANnN4RiROF3wCZxs9Y5790CfQyDBTEH8umBbsW6aUbVcVUs6M
+vs6JMDYwagNyPqZxAgvYsFIoSpgxEn+uhNJYGbes4ryTngGw6ZYRFx74CRDs778r
+pCbMTdXGP3dt7/aeNJ1F39tw1UWEluq6fwgRdlzJKwkCxs0e7HrBO0nylgNd44+B
++eICV1++CBwWzAnuirt+j8+dWmZQGW0aSQMyjPD/nXkJI9vzutkR/4FOjRzJa/vY
+k8FLMpuVisx72HN0DBDcp6vg7syMski5o82qk0bvgl7cl9ndhwMyeXPHds0Cjix0
+YbbULy7PhGLhlCX5DPaPOpCjA0yvcr+dWNDbfReMAWMwtptdVhQAYNTGp09VkqVn
+FUZZv+mm/oYFTToVMQpC8/9Ec+FsX6DXC5uQqvOhO88pPwiCLp0/KyT12TjWQpF+
+d2sL0ghSuFVRwgRN6w/s
+=RY1V
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.31-r7.ebuild b/net-dns/avahi/avahi-0.6.31-r7.ebuild
new file mode 100644
index 000000000000..4a45c278c226
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.31-r7.ebuild
@@ -0,0 +1,242 @@
+# 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-r7.ebuild,v 1.1 2014/11/22 23:32:32 mgorny 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 ~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[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	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 )
+	)
+	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 )
+	selinux? ( sec-policy/selinux-avahi )
+"
+
+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) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable utils gtk-utils) \
+		--disable-qt3 \
+		$(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
+}