Parallel build problems, bug #113092.

Package-Manager: portage-2.0.53_rc7

5 files changed, 8 insertions, 94 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 91823158aea4..8a6c89f1dedb 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.18 2005/11/14 21:53:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.19 2005/11/21 14:23:04 swegener Exp $
+
+  21 Nov 2005; Sven Wegener <swegener@gentoo.org> avahi-0.5.2-r1.ebuild:
+  Parallel build problems, bug #113092.
 
   14 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> avahi-0.5.2-r1.ebuild:
   Added to ~ppc. See bug #111461.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 4e1b1bbcca81..2c88e5bb41b5 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,4 @@
-MD5 8e8ac5bf135fe72ed0d12a9471d69401 ChangeLog 2607
-MD5 560435d4e0419fa966e3b0221d9e1b48 avahi-0.5.2-r1.ebuild 2079
-MD5 caaff3c113236f4152c8cbbd0774c70d avahi-0.5.2.ebuild 1958
-MD5 b06b1183ea48e210c1943f0913f63714 files/digest-avahi-0.5.2 63
+MD5 be362537ca14ec264b5b4067ac63bf15 ChangeLog 2723
+MD5 5da4a9160b981e4d0f2e64e12a39de37 avahi-0.5.2-r1.ebuild 2085
 MD5 b06b1183ea48e210c1943f0913f63714 files/digest-avahi-0.5.2-r1 63
 MD5 e522a390cede4510e8dbd0446e695912 metadata.xml 297
diff --git a/net-dns/avahi/avahi-0.5.2-r1.ebuild b/net-dns/avahi/avahi-0.5.2-r1.ebuild
index d86e1c36b50a..3d61341b3c66 100644
--- a/net-dns/avahi/avahi-0.5.2-r1.ebuild
+++ b/net-dns/avahi/avahi-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2-r1.ebuild,v 1.4 2005/11/14 21:53:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2-r1.ebuild,v 1.5 2005/11/21 14:23:04 swegener Exp $
 
 inherit eutils qt3 mono python
 
@@ -76,7 +76,7 @@ src_compile() {
 		$(use_enable gtk glib) \
 		${myconf} \
 		|| die "econf failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
diff --git a/net-dns/avahi/avahi-0.5.2.ebuild b/net-dns/avahi/avahi-0.5.2.ebuild
deleted file mode 100644
index b37d408be93d..000000000000
--- a/net-dns/avahi/avahi-0.5.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.5.2.ebuild,v 1.4 2005/11/10 11:07:30 swegener Exp $
-
-inherit eutils qt3 mono python
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://www.freedesktop.org/Software/Avahi"
-SRC_URI="http://www.freedesktop.org/~lennart/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc mono gtk python qt"
-
-RDEPEND="dev-libs/libdaemon
-	dev-libs/expat
-	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.3 )
-	dbus? ( >=sys-apps/dbus-0.30 )
-	python? (
-		>=virtual/python-2.4
-		gtk? ( >=dev-python/pygtk-2 )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-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
-
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-}
-
-src_compile() {
-	local myconf=""
-
-	if use python
-	then
-		use dbus && myconf="${myconf} --enable-python-dbus"
-		use gtk && myconf="${myconf} --enable-pygtk"
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-qt4 \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-mono-docs \
-		$(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) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	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/files/digest-avahi-0.5.2 b/net-dns/avahi/files/digest-avahi-0.5.2
deleted file mode 100644
index f53471ba3676..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc7ce24ffaab251a2002bf1dfdbe256d avahi-0.5.2.tar.gz 651504