From efdc04a6e009bf4f7d531f8c2e8eabc017bc9d1c Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 29 Dec 2011 16:03:38 +0100 Subject: [PATCH] add updated avahi --- eclass/avahi.eclass | 102 ++++++++++++ net-dns/avahi-base/Manifest | 5 + .../avahi-base/avahi-base-0.6.30-r2.ebuild | 157 ++++++++++++++++++ net-dns/avahi-base/files/autoipd-openrc.sh | 32 ++++ net-dns/avahi-base/files/autoipd.sh | 52 ++++++ ....6.x-openrc-0.9.x-init-scripts-fixes.patch | 22 +++ net-dns/avahi-base/metadata.xml | 17 ++ net-dns/avahi-gtk/Manifest | 4 + net-dns/avahi-gtk/avahi-gtk-0.6.30-r2.ebuild | 62 +++++++ .../avahi-0.6.28-optional-gtk-utils.patch | 61 +++++++ net-dns/avahi-gtk/metadata.xml | 8 + net-dns/avahi-gtk3/Manifest | 3 + .../avahi-gtk3/avahi-gtk3-0.6.30-r2.ebuild | 44 +++++ net-dns/avahi-gtk3/metadata.xml | 8 + net-dns/avahi-mono/Manifest | 3 + .../avahi-mono/avahi-mono-0.6.30-r2.ebuild | 54 ++++++ net-dns/avahi-mono/metadata.xml | 8 + net-dns/avahi-qt/Manifest | 3 + net-dns/avahi-qt/avahi-qt-0.6.30-r2.ebuild | 42 +++++ net-dns/avahi-qt/metadata.xml | 8 + net-dns/avahi/Manifest | 2 + net-dns/avahi/avahi-0.6.30-r2.ebuild | 24 +++ net-dns/avahi/metadata.xml | 17 ++ 23 files changed, 738 insertions(+) create mode 100644 eclass/avahi.eclass create mode 100644 net-dns/avahi-base/Manifest create mode 100644 net-dns/avahi-base/avahi-base-0.6.30-r2.ebuild create mode 100644 net-dns/avahi-base/files/autoipd-openrc.sh create mode 100644 net-dns/avahi-base/files/autoipd.sh create mode 100644 net-dns/avahi-base/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch create mode 100644 net-dns/avahi-base/metadata.xml create mode 100644 net-dns/avahi-gtk/Manifest create mode 100644 net-dns/avahi-gtk/avahi-gtk-0.6.30-r2.ebuild create mode 100644 net-dns/avahi-gtk/files/avahi-0.6.28-optional-gtk-utils.patch create mode 100644 net-dns/avahi-gtk/metadata.xml create mode 100644 net-dns/avahi-gtk3/Manifest create mode 100644 net-dns/avahi-gtk3/avahi-gtk3-0.6.30-r2.ebuild create mode 100644 net-dns/avahi-gtk3/metadata.xml create mode 100644 net-dns/avahi-mono/Manifest create mode 100644 net-dns/avahi-mono/avahi-mono-0.6.30-r2.ebuild create mode 100644 net-dns/avahi-mono/metadata.xml create mode 100644 net-dns/avahi-qt/Manifest create mode 100644 net-dns/avahi-qt/avahi-qt-0.6.30-r2.ebuild create mode 100644 net-dns/avahi-qt/metadata.xml create mode 100644 net-dns/avahi/Manifest create mode 100644 net-dns/avahi/avahi-0.6.30-r2.ebuild create mode 100644 net-dns/avahi/metadata.xml diff --git a/eclass/avahi.eclass b/eclass/avahi.eclass new file mode 100644 index 0000000..9080718 --- /dev/null +++ b/eclass/avahi.eclass @@ -0,0 +1,102 @@ +# Copyright 2004-2011 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $ + +SUPPORTED_AVAHI_MODULES="base gtk gtk3 mono qt" + +# @ECLASS-VARIABLE: AVAHI_MODULE +# @DESCRIPTION: +# Set this variable to the avahi module ebuild name, by default it's used +# the second part of PN, for example: for avahi-glib, it is "glib". +# Supported avahi modules: +# base gtk gtk3 mono qt +AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}" + +# @ECLASS-VARIABLE: AVAHI_PATCHES +# @DEFAULT-UNSET +# @DESCRIPTION: +# List of patches to apply +if [ -z "${AVAHI_PATCHES}" ]; then + AVAHI_PATCHES=() +fi + +# @ECLASS-VARIABLE: AVAHI_MODULE_DEPEND +# @DESCRIPTION: +# Avahi module built time dependencies list +AVAHI_MODULE_DEPEND="${AVAHI_MODULE_DEPEND:-}" + +# @ECLASS-VARIABLE: AVAHI_MODULE_RDEPEND +# @DESCRIPTION: +# Avahi module run time dependencies list +AVAHI_MODULE_RDEPEND="${AVAHI_MODULE_RDEPEND:-}" + +# @ECLASS-VARIABLE: AVAHI_MODULE_PDEPEND +# @DESCRIPTION: +# Avahi module post dependencies list +AVAHI_MODULE_PDEPEND="${AVAHI_MODULE_PDEPEND:-}" + +_supported="0" +for mod in ${SUPPORTED_AVAHI_MODULES} ; do + if [ "${mod}" = "${AVAHI_MODULE}" ]; then + _supported="1" + break + fi +done +if [ "${_supported}" = "0" ]; then + die "Unsupported avahi module: ${AVAHI_MODULE}" +fi + +MY_P=${P/-${AVAHI_MODULE}} + +inherit autotools eutils flag-o-matic + +DESCRIPTION="avahi ${AVAHI_MODULE} module" +HOMEPAGE="http://avahi.org/" +SRC_URI="http://avahi.org/download/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" + +AVAHI_COMMON_DEPEND=">=dev-util/intltool-0.40.5 + >=dev-util/pkgconfig-0.9.0" +DEPEND="${AVAHI_MODULE_DEPEND} ${AVAHI_COMMON_DEPEND}" +RDEPEND="${AVAHI_MODULE_RDEPEND}" +PDEPEND="${AVAHI_MODULE_PDEPEND}" + +avahi_src_prepare() { + sed -i\ + -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ + doxygen_to_devhelp.xsl || die + + for i in ${!AVAHI_PATCHES[@]}; do + epatch "${AVAHI_PATCHES[i]}" + done + + eautoreconf +} + +avahi_src_configure() { + use sh && replace-flags -O? -O0 + # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module + unset DISPLAY + local myconf=" + --disable-static + --localstatedir=/var + --with-distro=gentoo + --disable-xmltoman + --disable-monodoc + --enable-glib + --enable-gobject + --disable-qt3 + $@" + econf ${myconf} +} + +avahi_src_install-cleanup() { + # Remove .la files + find "${D}" -name '*.la' -exec rm -f {} + || die +} + +EXPORT_FUNCTIONS src_prepare src_configure diff --git a/net-dns/avahi-base/Manifest b/net-dns/avahi-base/Manifest new file mode 100644 index 0000000..cb2097e --- /dev/null +++ b/net-dns/avahi-base/Manifest @@ -0,0 +1,5 @@ +AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0 +AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 +DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f +EBUILD avahi-base-0.6.30.ebuild 3637 RMD160 abdb11b88038de5376691eec8ecee5d38626ce1a SHA1 7d70b1152ddcb858afcd7faea47576e298a58715 SHA256 5afabde1b295cf3f71e4ee1f961b824478779514d854f1094767887a97379f8b +MISC metadata.xml 606 RMD160 4dcc212bb1e823310d9d73c72022b32e41dfc9fe SHA1 1a1a1f274dd074e380d2fa9275e3b707b6626d00 SHA256 b051169158ed4c39ba6eb9080c0de8d637f3f32b01f85f6cca57c8817f68d9e0 diff --git a/net-dns/avahi-base/avahi-base-0.6.30-r2.ebuild b/net-dns/avahi-base/avahi-base-0.6.30-r2.ebuild new file mode 100644 index 0000000..7b15c15 --- /dev/null +++ b/net-dns/avahi-base/avahi-base-0.6.30-r2.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2011 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +PYTHON_DEPEND="python? 2" +PYTHON_USE_WITH="gdbm" +PYTHON_USE_WITH_OPT="python" + +DBUS_DEPEND=">=sys-apps/dbus-0.30" +IUSE="autoipd bookmarks dbus doc gdbm howl-compat introspection ipv6 + mdnsresponder-compat python test" +COMMON_DEPEND=">=dev-libs/libdaemon-0.14 + dev-libs/expat + dev-libs/glib:2 + gdbm? ( sys-libs/gdbm ) + dbus? ( + ${DBUS_DEPEND} + python? ( dev-python/dbus-python ) + ) + howl-compat? ( ${DBUS_DEPEND} ) + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + mdnsresponder-compat? ( ${DBUS_DEPEND} ) + bookmarks? ( + dev-python/twisted + dev-python/twisted-web + ) + kernel_linux? ( sys-libs/libcap ) + " +AVAHI_MODULE_DEPEND="${COMMON_DEPEND} + doc? ( app-doc/doxygen )" +AVAHI_MODULE_RDEPEND="${COMMON_DEPEND} + howl-compat? ( !net-misc/howl ) + mdnsresponder-compat? ( !net-misc/mDNSResponder )" +AVAHI_PATCHES=( "${FILESDIR}/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch" ) + +inherit eutils multilib python avahi + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + +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 +} + +src_prepare() { + if use ipv6; then + sed -i \ + -e s/use-ipv6=no/use-ipv6=yes/ \ + avahi-daemon/avahi-daemon.conf || die + fi +} + +src_configure() { + local myconf="" + if use python; then + myconf+=" $(use_enable dbus python-dbus)" + fi + + # these require dbus enabled + if use mdnsresponder-compat || use howl-compat; then + myconf+=" --enable-dbus" + fi + + myconf+=" + $(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 dbus) + $(use_enable python) + $(use_enable introspection) + $(use_enable gdbm) + --disable-qt4 + --disable-gtk + --disable-gtk3 + --disable-pygtk + --disable-mono" + if use python; then + myconf+=" $(use_enable dbus python-dbus)" + else + myconf+=" --disable-python-dbus" + fi + avahi_src_configure "${myconf}" +} + +src_compile() { + emake || die "emake failed" + use doc && { emake avahi.devhelp || die ; } +} + +src_install() { + emake install py_compile=true DESTDIR="${D}" || die "make install failed" + use bookmarks || rm -f "${D}"/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 + + 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 + + echo + elog "If you changed USE flags or did a version/revision bump, make sure" + elog "to rebuild all the modules:" + for mod in ${SUPPORTED_AVAHI_MODULES}; do + elog " net-dns/avahi-${mod}" + done + echo + + avahi_src_install-cleanup +} + +pkg_postrm() { + use python && python_mod_cleanup avahi +} + +pkg_postinst() { + use python && python_mod_optimize avahi + + if use autoipd; then + echo + elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" + elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" + fi + + if use dbus; then + echo + elog "If this is your first install of avahi please reload your dbus config" + elog "with /etc/init.d/dbus reload before starting avahi-daemon!" + fi +} diff --git a/net-dns/avahi-base/files/autoipd-openrc.sh b/net-dns/avahi-base/files/autoipd-openrc.sh new file mode 100644 index 0000000..dec3aa0 --- /dev/null +++ b/net-dns/avahi-base/files/autoipd-openrc.sh @@ -0,0 +1,32 @@ +# Copyright (C) 2004-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Contributed by Sven Wegener (swegener@gentoo.org) + +_config_vars="$_config_vars autoipd" + +autoipd_depend() { + program /usr/sbin/avahi-autoipd + after interface +} + +autoipd_start() { + _exists true || return 1 + + eval args=\$autoipd_${IFVAR} + + ebegin "Starting avahi-autoipd" + /usr/sbin/avahi-autoipd --daemonize --syslog --wait ${args} "${IFACE}" + eend "${?}" || return 1 + + _show_address + + return 0 +} + +autoipd_stop() { + /usr/sbin/avahi-autoipd --check --syslog "${IFACE}" || return 0 + + ebegin "Stopping avahi-autoipd" + /usr/sbin/avahi-autoipd --kill --syslog "${IFACE}" + eend "${?}" +} diff --git a/net-dns/avahi-base/files/autoipd.sh b/net-dns/avahi-base/files/autoipd.sh new file mode 100644 index 0000000..89d02e3 --- /dev/null +++ b/net-dns/avahi-base/files/autoipd.sh @@ -0,0 +1,52 @@ +# Copyright (c) 2004-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Contributed by Sven Wegener (swegener@gentoo.org) + +# void autoipd_depend(void) +# +# Sets up the dependencies for the module +autoipd_depend() { + after interface +} + +# void autoipd_expose(void) +# +# Expose variables that can be configured +autoipd_expose() { + variables autoipd +} + +# bool autoipd_start(char *iface) +# +# Tries to configure the interface via avahi-autoipd +autoipd_start() { + local iface="${1}" ifvar="$(bash_variable "${iface}")" opts="autoipd_${ifvar}" addr="" + + interface_exists "${iface}" true || return 1 + + ebegin "Starting avahi-autoipd" + if /usr/sbin/avahi-autoipd --daemonize --syslog --wait ${!opts} "${iface}" + then + eend 0 + addr="$(interface_get_address "${iface}")" + einfo "${iface} received address ${addr}" + return 0 + fi + + eend "${?}" "Failed to get address via avahi-autoipd!" +} + +# bool autoipd_stop(char *iface) +# +# Stops a running avahi-autoipd instance +autoipd_stop() { + local iface="${1}" + + /usr/sbin/avahi-autoipd --check --syslog "${iface}" || return 0 + + ebegin "Stopping avahi-autoipd" + /usr/sbin/avahi-autoipd --kill --syslog "${iface}" + eend "${?}" "Failed to stop running avahi-autoipd instance!" +} + +# vim: set ts=4 : diff --git a/net-dns/avahi-base/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch b/net-dns/avahi-base/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch new file mode 100644 index 0000000..394f6d3 --- /dev/null +++ b/net-dns/avahi-base/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch @@ -0,0 +1,22 @@ +--- avahi-0.6.30/initscript/gentoo/avahi-daemon.in ++++ avahi-0.6.30/initscript/gentoo/avahi-daemon.in +@@ -2,7 +2,7 @@ + # Copyright 1999-2007 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + +-opts="reload" ++extra_started_commands="reload" + + depend() { + before netmount nfsmount +--- avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in ++++ avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in +@@ -2,7 +2,7 @@ + # Copyright 1999-2007 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + +-opts="reload" ++extra_started_commands="reload" + + depend() { + need avahi-daemon diff --git a/net-dns/avahi-base/metadata.xml b/net-dns/avahi-base/metadata.xml new file mode 100644 index 0000000..9e286f8 --- /dev/null +++ b/net-dns/avahi-base/metadata.xml @@ -0,0 +1,17 @@ + + + +no-herd + + lxnay@gentoo.org + + + Build and install the IPv4LL (RFC3927) network address + configuration daemon + Install the avahi-bookmarks application (requires + dev-python/twisted) + Enable compat libraries for howl + Enable compat libraries for + mDNSResponder + + diff --git a/net-dns/avahi-gtk/Manifest b/net-dns/avahi-gtk/Manifest new file mode 100644 index 0000000..0aae603 --- /dev/null +++ b/net-dns/avahi-gtk/Manifest @@ -0,0 +1,4 @@ +AUX avahi-0.6.28-optional-gtk-utils.patch 1897 RMD160 a58dd32d6035b941dcaf337022c50b0b521e34f1 SHA1 a8794964f75ccede0b1953a65f9bd1a2863801dd SHA256 5bfe28c75d923cd858f591ddc090fc8c8d1bc605dcaaaf028c92ba4cbc098e8f +DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f +EBUILD avahi-gtk-0.6.30.ebuild 1426 RMD160 bd98b7620c35dda4c22764c54f2102502a5670c7 SHA1 842d5db3fa3897847977cdc28dd1fce9795278ae SHA256 97a2424768386d024932f126f333da656c6f96fbb3065aa624fc465410e5fe47 +MISC metadata.xml 220 RMD160 07c52cb369217fc5bbfffc4ba5ffc957d0810313 SHA1 83c1ba4fbc439d17563b2fe65df6c88cd594394d SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 diff --git a/net-dns/avahi-gtk/avahi-gtk-0.6.30-r2.ebuild b/net-dns/avahi-gtk/avahi-gtk-0.6.30-r2.ebuild new file mode 100644 index 0000000..bd2e509 --- /dev/null +++ b/net-dns/avahi-gtk/avahi-gtk-0.6.30-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2011 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +IUSE="python utils dbus" +COMMON_DEPEND="=net-dns/avahi-base-${PVR}[dbus=,python=] + >=x11-libs/gtk+-2.14.0:2 + python? ( >=dev-python/pygtk-2 )" +AVAHI_MODULE_DEPEND="${COMMON_DEPEND}" +AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}" + +AVAHI_PATCHES=( "${FILESDIR}/avahi-0.6.28-optional-gtk-utils.patch" ) +inherit eutils python avahi + +src_configure() { + local myconf=" --enable-gtk + --disable-gtk3 + --disable-mono + $(use_enable dbus) + $(use_enable utils gtk-utils) + --enable-pygtk" + if use python; then + myconf+=" $(use_enable dbus python-dbus)" + fi + avahi_src_configure "${myconf}" +} + +src_compile() { + for target in avahi-common avahi-client avahi-glib avahi-ui; do + cd "${S}"/${target} || die + emake || die + done + cd "${S}" || die + emake avahi-ui.pc || die +} + +src_install() { + cd "${S}"/avahi-ui || die + emake install py_compile=true DESTDIR="${D}" || die + if use python; then + cd "${S}"/avahi-python/avahi-discover || die + emake install py_compile=true DESTDIR="${D}" || die + fi + cd "${S}" || die + dodir /usr/$(get_libdir)/pkgconfig + insinto /usr/$(get_libdir)/pkgconfig + doins avahi-ui.pc + + avahi_src_install-cleanup +} + +pkg_postrm() { + use python && python_mod_cleanup $(use dbus && echo avahi_discover) +} + +pkg_postinst() { + use python && python_mod_optimize avahi $(use dbus && echo avahi_discover) +} + + diff --git a/net-dns/avahi-gtk/files/avahi-0.6.28-optional-gtk-utils.patch b/net-dns/avahi-gtk/files/avahi-0.6.28-optional-gtk-utils.patch new file mode 100644 index 0000000..1de5310 --- /dev/null +++ b/net-dns/avahi-gtk/files/avahi-0.6.28-optional-gtk-utils.patch @@ -0,0 +1,61 @@ +--- avahi-discover-standalone/Makefile.am ++++ avahi-discover-standalone/Makefile.am +@@ -23,7 +23,7 @@ + # This cool debug trap works on i386/gcc only + AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' + +-if HAVE_GTK2OR3 ++if ENABLE_GTK_UTILS + if HAVE_GLIB + bin_PROGRAMS = \ + avahi-discover-standalone +--- avahi-ui/Makefile.am ++++ avahi-ui/Makefile.am +@@ -76,6 +76,7 @@ + libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" + endif + ++if ENABLE_GTK_UTILS + bin_PROGRAMS = bssh + desktop_DATA += bssh.desktop bvnc.desktop + @INTLTOOL_DESKTOP_RULE@ +@@ -102,6 +103,7 @@ + bvnc.desktop.in: bvnc.desktop.in.in + $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ + ++endif # ENABLE_GTK_UTILS + endif # HAVE_GLIB + endif + endif +--- configure.ac ++++ configure.ac +@@ -564,7 +564,20 @@ + fi + AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes") + ++# ++# Check for GTK+ Utils ++# ++AC_ARG_ENABLE(gtk-utils, ++ AS_HELP_STRING([--disable-gtk-utils],[Disable GTK+ utilities]), ++ [case "${enableval}" in ++ yes) ENABLE_GTK_UTILS=yes ;; ++ no) ENABLE_GTK_UTILS=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk-utils) ;; ++ esac], ++ [ENABLE_GTK_UTILS=yes]) ++ + AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" ) ++AM_CONDITIONAL(ENABLE_GTK_UTILS, test "$HAVE_GTK2OR3" -a "x$ENABLE_GTK_UTILS" = "xyes" ) + + # + # D-Bus +@@ -1223,7 +1236,7 @@ + Building avahi-python: ${BUILD_PYTHON} + Building libavahi-glib: ${HAVE_GLIB} + Building libavahi-gobject: ${BUILD_GOBJECT} +- Building avahi-discover-standalone: ${HAVE_GTK2OR3} ++ Building avahi-discover-standalone: ${ENABLE_GTK_UTILS} + Building libavahi-qt3: ${HAVE_QT3} + Building libavahi-qt4: ${HAVE_QT4} + Building avahi-sharp: ${HAVE_MONO} diff --git a/net-dns/avahi-gtk/metadata.xml b/net-dns/avahi-gtk/metadata.xml new file mode 100644 index 0000000..2c67378 --- /dev/null +++ b/net-dns/avahi-gtk/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + + lxnay@gentoo.org + + diff --git a/net-dns/avahi-gtk3/Manifest b/net-dns/avahi-gtk3/Manifest new file mode 100644 index 0000000..e8abfbb --- /dev/null +++ b/net-dns/avahi-gtk3/Manifest @@ -0,0 +1,3 @@ +DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f +EBUILD avahi-gtk3-0.6.30.ebuild 1035 RMD160 adb75c02846445a1adbe44d7642f7ec233732ee0 SHA1 cb2d0d0554aba0724fe79bf02da0b10635c22e32 SHA256 4ab4dc362403b8fabb27cd4336949d3bea15d434ee25ccdafaef3bf55d1daed7 +MISC metadata.xml 220 RMD160 07c52cb369217fc5bbfffc4ba5ffc957d0810313 SHA1 83c1ba4fbc439d17563b2fe65df6c88cd594394d SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 diff --git a/net-dns/avahi-gtk3/avahi-gtk3-0.6.30-r2.ebuild b/net-dns/avahi-gtk3/avahi-gtk3-0.6.30-r2.ebuild new file mode 100644 index 0000000..5c9ef9e --- /dev/null +++ b/net-dns/avahi-gtk3/avahi-gtk3-0.6.30-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2011 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +IUSE="" +COMMON_DEPEND="=net-dns/avahi-base-${PVR} + x11-libs/gtk+:3" +AVAHI_MODULE_DEPEND="${COMMON_DEPEND}" +AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}" + +inherit eutils avahi + +src_configure() { + local myconf=" --disable-gtk --enable-gtk3" + avahi_src_configure "${myconf}" +} + +src_compile() { + for target in avahi-common avahi-client avahi-glib avahi-ui; do + cd "${S}"/${target} || die + emake || die + done + cd "${S}" || die + emake avahi-ui-gtk3.pc || die +} + +src_install() { + cd "${S}"/avahi-ui || die + emake -j1 install py_compile=true DESTDIR="${D}" || die + cd "${S}" || die + dodir /usr/$(get_libdir)/pkgconfig + insinto /usr/$(get_libdir)/pkgconfig + doins avahi-ui-gtk3.pc + + avahi_src_install-cleanup + + # Workaround for avahi-ui.h collision between avahi-gtk and avahi-gtk3 + root_avahi_ui="${ROOT}usr/include/avahi-ui/avahi-ui.h" + if [ -e "${root_avahi_ui}" ]; then + rm -f "${ED}usr/include/avahi-ui/avahi-ui.h" + fi +} diff --git a/net-dns/avahi-gtk3/metadata.xml b/net-dns/avahi-gtk3/metadata.xml new file mode 100644 index 0000000..2c67378 --- /dev/null +++ b/net-dns/avahi-gtk3/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + + lxnay@gentoo.org + + diff --git a/net-dns/avahi-mono/Manifest b/net-dns/avahi-mono/Manifest new file mode 100644 index 0000000..23dfaf8 --- /dev/null +++ b/net-dns/avahi-mono/Manifest @@ -0,0 +1,3 @@ +DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f +EBUILD avahi-mono-0.6.30.ebuild 1165 RMD160 e4cd774f227399b56793774b28101655eee09b61 SHA1 59755f577058f113883c05dd4a36dea9efdcf89b SHA256 c26aa97a3244d337a9152fc4b76790b17b21bb7aa8edb488c828f3e2a2cdf470 +MISC metadata.xml 220 RMD160 07c52cb369217fc5bbfffc4ba5ffc957d0810313 SHA1 83c1ba4fbc439d17563b2fe65df6c88cd594394d SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 diff --git a/net-dns/avahi-mono/avahi-mono-0.6.30-r2.ebuild b/net-dns/avahi-mono/avahi-mono-0.6.30-r2.ebuild new file mode 100644 index 0000000..4374cf1 --- /dev/null +++ b/net-dns/avahi-mono/avahi-mono-0.6.30-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2011 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +IUSE="doc gtk" +COMMON_DEPEND="=net-dns/avahi-base-${PVR}[dbus] + >=dev-lang/mono-1.1.10 + gtk? ( + =net-dns/avahi-gtk-${PVR} + >=dev-dotnet/gtk-sharp-2 + )" +AVAHI_MODULE_DEPEND="${COMMON_DEPEND} + doc? ( >=virtual/monodoc-1.1.8 )" +AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}" + +inherit eutils avahi + +src_configure() { + local myconf="--enable-mono --enable-dbus" + myconf+=" $(use_enable doc monodoc)" + avahi_src_configure "${myconf}" +} + +src_compile() { + for target in avahi-common avahi-client avahi-glib avahi-sharp; do + cd "${S}"/${target} || die + emake || die + done + cd "${S}" || die + emake avahi-sharp.pc || die + if use gtk; then + cd "${S}"/avahi-ui-sharp || die + emake || die + cd "${S}" || die + emake avahi-ui-sharp.pc || die + fi +} + +src_install() { + cd "${S}"/avahi-sharp || die + emake install DESTDIR="${D}" || die + if use gtk; then + cd "${S}"/avahi-ui-sharp || die + emake install DESTDIR="${D}" || die + fi + cd "${S}" || die + dodir /usr/$(get_libdir)/pkgconfig + insinto /usr/$(get_libdir)/pkgconfig + doins *.pc + + avahi_src_install-cleanup +} diff --git a/net-dns/avahi-mono/metadata.xml b/net-dns/avahi-mono/metadata.xml new file mode 100644 index 0000000..2c67378 --- /dev/null +++ b/net-dns/avahi-mono/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + + lxnay@gentoo.org + + diff --git a/net-dns/avahi-qt/Manifest b/net-dns/avahi-qt/Manifest new file mode 100644 index 0000000..b9331f1 --- /dev/null +++ b/net-dns/avahi-qt/Manifest @@ -0,0 +1,3 @@ +DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f +EBUILD avahi-qt-0.6.30.ebuild 785 RMD160 17f92c9f97a443b8e0812feef31bcd05135c1688 SHA1 5aa3848f03856c9b659e1bebe3c421eaa3f1994a SHA256 babc2807798b82e18fe8a60280fb5a02312c2ece71a0f14c07725b12065844c0 +MISC metadata.xml 220 RMD160 07c52cb369217fc5bbfffc4ba5ffc957d0810313 SHA1 83c1ba4fbc439d17563b2fe65df6c88cd594394d SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 diff --git a/net-dns/avahi-qt/avahi-qt-0.6.30-r2.ebuild b/net-dns/avahi-qt/avahi-qt-0.6.30-r2.ebuild new file mode 100644 index 0000000..275f6d8 --- /dev/null +++ b/net-dns/avahi-qt/avahi-qt-0.6.30-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2011 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit multilib + +IUSE="" +COMMON_DEPEND="=net-dns/avahi-base-${PVR} + x11-libs/qt-core:4" +AVAHI_MODULE_DEPEND="${COMMON_DEPEND}" +AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}" + +inherit eutils avahi + +src_configure() { + local myconf=" --enable-qt4 + --disable-mono" + avahi_src_configure "${myconf}" +} + +src_compile() { + cd "${S}"/avahi-common || die + emake || die + cd "${S}"/avahi-qt || die + emake || die + cd "${S}" || die + emake avahi-qt4.pc || die +} + +src_install() { + cd "${S}"/avahi-qt || die + emake install DESTDIR="${D}" || die + + cd "${S}" || die + dodir /usr/$(get_libdir)/pkgconfig + insinto /usr/$(get_libdir)/pkgconfig + doins avahi-qt4.pc + + avahi_src_install-cleanup +} diff --git a/net-dns/avahi-qt/metadata.xml b/net-dns/avahi-qt/metadata.xml new file mode 100644 index 0000000..2c67378 --- /dev/null +++ b/net-dns/avahi-qt/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + + lxnay@gentoo.org + + diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest new file mode 100644 index 0000000..93a7433 --- /dev/null +++ b/net-dns/avahi/Manifest @@ -0,0 +1,2 @@ +EBUILD avahi-0.6.30.ebuild 835 RMD160 47565e775c025c801ef8824d921f11c54888119d SHA1 2615751b171070be80a06edcd0ccdc334a8e8eb2 SHA256 c0991feae4379c0a330600594a06419ea8db8fe35459f64122fe9ae0d61e7901 +MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa diff --git a/net-dns/avahi/avahi-0.6.30-r2.ebuild b/net-dns/avahi/avahi-0.6.30-r2.ebuild new file mode 100644 index 0000000..2b21d3b --- /dev/null +++ b/net-dns/avahi/avahi-0.6.30-r2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2011 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +DESCRIPTION="System which facilitates service discovery on a local network (meta package)" +HOMEPAGE="http://avahi.org/" +SRC_URI="" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 +kernel_linux mdnsresponder-compat mono python qt4 test utils" + +COMMON_DEPEND="=net-dns/avahi-base-${PVR}[autoipd=,bookmarks=,dbus=,doc=,gdbm=,howl-compat=,introspection=,ipv6=,mdnsresponder-compat=,python=,test=] + gtk? ( =net-dns/avahi-gtk-${PVR} ) + utils? ( =net-dns/avahi-gtk-${PVR}[utils] ) + gtk3? ( =net-dns/avahi-gtk3-${PVR} ) + mono? ( =net-dns/avahi-mono-${PVR} ) + qt4? ( =net-dns/avahi-qt-${PVR} )" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${DEPEND}" diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml new file mode 100644 index 0000000..d8e743d --- /dev/null +++ b/net-dns/avahi/metadata.xml @@ -0,0 +1,17 @@ + + + +no-herd + + swegener@gentoo.org + + + Build and install the IPv4LL (RFC3927) network address + configuration daemon + Install the avahi-bookmarks application (requires + dev-python/twisted) + Enable compat libraries for howl + Enable compat libraries for + mDNSResponder + +