Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-dns/avahi/ChangeLog8
-rw-r--r--net-dns/avahi/avahi-0.6.4.ebuild119
-rw-r--r--net-dns/avahi/avahi-0.6.8.ebuild117
-rw-r--r--net-dns/avahi/avahi-0.6.9.ebuild11
-rw-r--r--net-dns/avahi/files/0.6.1-need-dbus-initscript.patch14
-rw-r--r--net-dns/avahi/files/avahi-0.6.3-mono-docs.patch13
-rw-r--r--net-dns/avahi/files/digest-avahi-0.6.43
-rw-r--r--net-dns/avahi/files/digest-avahi-0.6.83
8 files changed, 14 insertions, 274 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index c354238b3098..f7d7f102eb6d 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-dns/avahi
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.32 2006/03/02 22:08:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.33 2006/04/11 19:02:39 swegener Exp $
+
+ 11 Apr 2006; Sven Wegener <swegener@gentoo.org>
+ -files/avahi-0.6.3-mono-docs.patch,
+ -files/0.6.1-need-dbus-initscript.patch, -avahi-0.6.4.ebuild,
+ -avahi-0.6.8.ebuild, avahi-0.6.9.ebuild:
+ Made the glib dependency unconditional.
*avahi-0.6.9 (02 Mar 2006)
diff --git a/net-dns/avahi/avahi-0.6.4.ebuild b/net-dns/avahi/avahi-0.6.4.ebuild
deleted file mode 100644
index 00262e8696d3..000000000000
--- a/net-dns/avahi/avahi-0.6.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.4.ebuild,v 1.2 2006/01/19 19:00:41 cardoe Exp $
-
-inherit eutils qt3 mono python
-
-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="~amd64 ~ppc ~sh ~sparc ~x86"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt"
-
-RDEPEND=">=dev-libs/libdaemon-0.5
- dev-libs/expat
- gdbm? ( sys-libs/gdbm )
- qt? ( $(qt_min_version 3.3) )
- gtk? (
- >=x11-libs/gtk+-2
- >=gnome-base/libglade-2
- >=dev-libs/glib-2
- )
- mono? ( >=dev-lang/mono-1.1.10 )
- dbus? ( >=sys-apps/dbus-0.30 )
- python? (
- >=virtual/python-2.4
- dbus? (
- bookmarks? (
- dev-python/twisted
- dev-python/twisted-web
- )
- )
- gtk? ( >=dev-python/pygtk-2 )
- )
- dbus? (
- howl-compat? ( !net-misc/howl )
- mdnsresponder-compat? ( !net-misc/mDNSResponder )
- )"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- mono? ( >=dev-util/monodoc-1.1.8 )
- )"
-
-export PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
-
-pkg_setup() {
- if use python && ! built_with_use dev-lang/python gdbm ; then
- die "Need dev-lang/python compiled with gdbm support!"
- fi
-}
-
-pkg_preinst() {
- enewgroup avahi
- enewuser avahi -1 -1 -1 avahi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
- use dbus && epatch "${FILESDIR}"/0.6.1-need-dbus-initscript.patch
-
- epatch "${FILESDIR}"/${PN}-0.6.3-mono-docs.patch
-}
-
-src_compile() {
- local myconf=""
-
- if use python
- then
- use dbus && myconf="${myconf} --enable-python-dbus"
- use gtk && myconf="${myconf} --enable-pygtk"
- fi
-
- if use mono && use doc
- then
- myconf="${myconf} --enable-monodoc"
- fi
-
- econf \
- --localstatedir=/var \
- --with-distro=gentoo \
- --disable-qt4 \
- --disable-python-dbus \
- --disable-pygtk \
- --disable-xmltoman \
- --disable-monodoc \
- $(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 qt qt3) \
- $(use_enable gtk glib) \
- $(use_enable gdbm) \
- ${myconf} \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
- use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
-
- dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
- python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
-
-pkg_postinst() {
- python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
diff --git a/net-dns/avahi/avahi-0.6.8.ebuild b/net-dns/avahi/avahi-0.6.8.ebuild
deleted file mode 100644
index 89f7256f0b88..000000000000
--- a/net-dns/avahi/avahi-0.6.8.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.8.ebuild,v 1.1 2006/02/27 20:13:04 swegener Exp $
-
-inherit eutils qt3 mono python
-
-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="~amd64 ~ppc ~sh ~sparc ~x86"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt"
-
-RDEPEND=">=dev-libs/libdaemon-0.5
- dev-libs/expat
- gdbm? ( sys-libs/gdbm )
- qt? ( $(qt_min_version 3.3) )
- gtk? (
- >=x11-libs/gtk+-2
- >=gnome-base/libglade-2
- >=dev-libs/glib-2
- )
- mono? ( >=dev-lang/mono-1.1.10 )
- dbus? ( >=sys-apps/dbus-0.30 )
- python? (
- >=virtual/python-2.4
- dbus? (
- bookmarks? (
- dev-python/twisted
- dev-python/twisted-web
- )
- )
- gtk? ( >=dev-python/pygtk-2 )
- )
- dbus? (
- howl-compat? ( !net-misc/howl )
- mdnsresponder-compat? ( !net-misc/mDNSResponder )
- )"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- mono? ( >=dev-util/monodoc-1.1.8 )
- )"
-
-export PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
-
-pkg_setup() {
- if use python && ! built_with_use dev-lang/python gdbm ; then
- die "Need dev-lang/python compiled with gdbm support!"
- fi
-}
-
-pkg_preinst() {
- enewgroup avahi
- enewuser avahi -1 -1 -1 avahi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
- use dbus && epatch "${FILESDIR}"/0.6.1-need-dbus-initscript.patch
-}
-
-src_compile() {
- local myconf=""
-
- if use python
- then
- use dbus && myconf="${myconf} --enable-python-dbus"
- use gtk && myconf="${myconf} --enable-pygtk"
- fi
-
- if use mono && use doc
- then
- myconf="${myconf} --enable-monodoc"
- fi
-
- econf \
- --localstatedir=/var \
- --with-distro=gentoo \
- --disable-qt4 \
- --disable-python-dbus \
- --disable-pygtk \
- --disable-xmltoman \
- --disable-monodoc \
- $(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 qt qt3) \
- $(use_enable gtk glib) \
- $(use_enable gdbm) \
- ${myconf} \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
- use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
-
- dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
- python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
-
-pkg_postinst() {
- python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
diff --git a/net-dns/avahi/avahi-0.6.9.ebuild b/net-dns/avahi/avahi-0.6.9.ebuild
index d619c565946a..9e1dc6c561c8 100644
--- a/net-dns/avahi/avahi-0.6.9.ebuild
+++ b/net-dns/avahi/avahi-0.6.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.9.ebuild,v 1.1 2006/03/02 22:08:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.9.ebuild,v 1.2 2006/04/11 19:02:39 swegener Exp $
inherit eutils qt3 mono python
@@ -15,15 +15,17 @@ IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python q
RDEPEND=">=dev-libs/libdaemon-0.5
dev-libs/expat
+ >=dev-libs/glib-2
gdbm? ( sys-libs/gdbm )
qt? ( $(qt_min_version 3.3) )
gtk? (
>=x11-libs/gtk+-2
>=gnome-base/libglade-2
- >=dev-libs/glib-2
)
mono? ( >=dev-lang/mono-1.1.10 )
- dbus? ( >=sys-apps/dbus-0.30 )
+ dbus? (
+ >=sys-apps/dbus-0.30
+ )
python? (
>=virtual/python-2.4
dbus? (
@@ -60,6 +62,7 @@ pkg_preinst() {
src_unpack() {
unpack ${A}
cd "${S}"
+
epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
}
@@ -85,6 +88,7 @@ src_compile() {
--disable-pygtk \
--disable-xmltoman \
--disable-monodoc \
+ --enable-glib \
$(use_enable mdnsresponder-compat compat-libdns_sd) \
$(use_enable howl-compat compat-howl) \
$(use_enable doc doxygen-doc) \
@@ -93,7 +97,6 @@ src_compile() {
$(use_enable python) \
$(use_enable gtk) \
$(use_enable qt qt3) \
- $(use_enable gtk glib) \
$(use_enable gdbm) \
${myconf} \
|| die "econf failed"
diff --git a/net-dns/avahi/files/0.6.1-need-dbus-initscript.patch b/net-dns/avahi/files/0.6.1-need-dbus-initscript.patch
deleted file mode 100644
index 10b20215ebd1..000000000000
--- a/net-dns/avahi/files/0.6.1-need-dbus-initscript.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: initscript/gentoo/avahi-daemon.in
-===================================================================
---- initscript/gentoo/avahi-daemon.in (revision 1048)
-+++ initscript/gentoo/avahi-daemon.in (working copy)
-@@ -6,7 +6,8 @@
- opts="${opts} reload"
-
- depend() {
-- use net dbus
-+ use net
-+ need dbus
- }
-
- start() {
diff --git a/net-dns/avahi/files/avahi-0.6.3-mono-docs.patch b/net-dns/avahi/files/avahi-0.6.3-mono-docs.patch
deleted file mode 100644
index 643593d05937..000000000000
--- a/net-dns/avahi/files/avahi-0.6.3-mono-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- avahi-0.6.2/avahi-sharp/Makefile.am 2005-12-22 07:36:22.000000000 -0500
-+++ avahi-0.6.2/avahi-sharp/Makefile.am.new 2006-01-11 03:04:13.000000000 -0500
-@@ -64,7 +64,9 @@
- update-docs: $(ASSEMBLY)
- $(MONODOCER) -assembly:$(ASSEMBLY) -path:en
-
--avahi-sharp-docs.zip avahi-sharp-docs.tree: $(srcdir)/en/*/*
-+avahi-sharp-docs.zip: avahi-sharp-docs.tree
-+
-+avahi-sharp-docs.tree: $(srcdir)/en/*/*
- $(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
-
- docdir = $(MONODOC_DIR)
diff --git a/net-dns/avahi/files/digest-avahi-0.6.4 b/net-dns/avahi/files/digest-avahi-0.6.4
deleted file mode 100644
index 109af91b76d1..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12eb941043f26f82c51e99821ac52c44 avahi-0.6.4.tar.gz 859472
-RMD160 d2ab317c9da24b69507bf78e08393f09d218e296 avahi-0.6.4.tar.gz 859472
-SHA256 ee1c33dd14c45e54d13cf6135dd74fbd9c93b01833d80814543b60d32e76ad56 avahi-0.6.4.tar.gz 859472
diff --git a/net-dns/avahi/files/digest-avahi-0.6.8 b/net-dns/avahi/files/digest-avahi-0.6.8
deleted file mode 100644
index 7128a708bd72..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 28ef3c1f15d03f0dc73c9289a434d37c avahi-0.6.8.tar.gz 872080
-RMD160 87cdceff355e0f9f6ace775c64957a077261901e avahi-0.6.8.tar.gz 872080
-SHA256 1855045c44d4eea5757c9cf923d76deb27352793031a213223fb7d3ca0472c0d avahi-0.6.8.tar.gz 872080