From 23050364629cb430f9b7c600ff886c6e3a4d8726 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 16 Feb 2016 02:56:00 -0500 Subject: net-dns/avahi: version bump 0.6.32, drop rc. Package-Manager: portage-2.2.26 --- net-dns/avahi/Manifest | 2 +- net-dns/avahi/avahi-0.6.32.ebuild | 230 +++++++++++++++++++++++++++++++++ net-dns/avahi/avahi-0.6.32_rc.ebuild | 239 ----------------------------------- 3 files changed, 231 insertions(+), 240 deletions(-) create mode 100644 net-dns/avahi/avahi-0.6.32.ebuild delete mode 100644 net-dns/avahi/avahi-0.6.32_rc.ebuild diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index 5e9703b1b612..d6e8b910f12a 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -1,2 +1,2 @@ DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f -DIST avahi-0.6.32_rc.tar.gz 922001 SHA256 e5eb81b1686bb7c7fb02f6b752c508c103f21d170039303fe0796d3282fa2f44 SHA512 2876510aa78b2db0f51383e5f39440cd5dd3a153663862044a6c531ebc67a546e5a5b5fd9c52ab42083300eb39d906511c0c5ab917e6b5979aaba35688e942b6 WHIRLPOOL a612138090770617f82e80be601e76ad0ec9c757a19f1d30de008912044c93976b3b97c0c4946878a32fe44e773648fa64abaecd30d675b48cf75db6dc69244f +DIST avahi-0.6.32.tar.gz 934004 SHA256 7eb693d878246f0cd05034173fb3ed53447a84dd3b7f01745313cad11071226e SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18 WHIRLPOOL e139eca2d1698976a5fca21361c037dd2b1c075654b01674bea3fa22db70067999aba2a61cbfcf69281d5274f5080450e24cf64f9cec1702d142e129fbf03dc7 diff --git a/net-dns/avahi/avahi-0.6.32.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild new file mode 100644 index 000000000000..66126722a31e --- /dev/null +++ b/net-dns/avahi/avahi-0.6.32.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_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="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${P}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" +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[${MULTILIB_USEDEP}] + gdbm? ( sys-libs/gdbm[${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[${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} + doc? ( app-doc/doxygen ) + app-doc/xmltoman + dev-util/intltool + virtual/pkgconfig[${MULTILIB_USEDEP}] +" + +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=yes/use-ipv6=no/ \ + 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 + # https://github.com/lathiat/avahi/issues/24 + epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch + + # Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575 + # https://github.com/lathiat/avahi/issues/24 + epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch + + # Fix build under various locales, bug #501664 + # https://github.com/lathiat/avahi/issues/27 + epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch + + # Bug #525832 + epatch_user + + # 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 \ + --enable-manpages \ + --enable-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 + + # https://github.com/lathiat/avahi/issues/28 + 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_=( autoipd ) in /etc/conf.d/net!" + elog + fi +} diff --git a/net-dns/avahi/avahi-0.6.32_rc.ebuild b/net-dns/avahi/avahi-0.6.32_rc.ebuild deleted file mode 100644 index dc9cd67709f0..000000000000 --- a/net-dns/avahi/avahi-0.6.32_rc.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_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="https://github.com/lathiat/avahi/archive/0.6.32-rc.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/avahi-0.6.32-rc" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" -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[${MULTILIB_USEDEP}] - gdbm? ( sys-libs/gdbm[${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[${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} - doc? ( app-doc/doxygen ) - app-doc/xmltoman - dev-util/intltool - virtual/pkgconfig[${MULTILIB_USEDEP}] -" - -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=yes/use-ipv6=no/ \ - 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 - # https://github.com/lathiat/avahi/issues/24 - epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch - - # Fix init scripts for >=openrc-0.9.0, bug #383641 - # https://github.com/lathiat/avahi/issues/25 - epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch - - # Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575 - # https://github.com/lathiat/avahi/issues/24 - epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch - - # Allow building client without the daemon - # https://github.com/lathiat/avahi/issues/26 - epatch "${FILESDIR}"/${PN}-0.6.31-build-client-without-daemon.patch - - # Fix build under various locales, bug #501664 - # https://github.com/lathiat/avahi/issues/27 - epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch - - # Bug #525832 - epatch_user - - # 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 \ - --enable-manpages \ - --enable-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 - - # https://github.com/lathiat/avahi/issues/28 - 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_=( autoipd ) in /etc/conf.d/net!" - elog - fi -} -- cgit v1.2.3-65-gdbad