4 files changed, 18 insertions, 95 deletions
diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 46e0723b0d4a..c0eb4f580540 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.108 2012/02/08 14:51:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.109 2012/02/23 10:09:33 voyageur Exp $
+
+*gnustep-base-1.24.0-r1 (23 Feb 2012)
+
+  23 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  gnustep-base-1.20.1.ebuild, -gnustep-base-1.22.1.ebuild,
+  -gnustep-base-1.24.0.ebuild, +gnustep-base-1.24.0-r1.ebuild:
+  Update zeroconf dependencies (bug #405383), remove old unstable version
 
 *gnustep-base-1.24.0 (08 Feb 2012)
 
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild
index 978a95048e06..0a4e2814f1c3 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild,v 1.7 2011/11/27 19:41:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.20.1.ebuild,v 1.8 2012/02/23 10:09:33 voyageur Exp $
 
 EAPI="3"
 
@@ -27,9 +27,7 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
 	>=dev-libs/gmp-4.1
 	>=dev-libs/openssl-0.9.7
 	>=sys-libs/zlib-1.2
-	zeroconf? ( || (
-		net-dns/avahi[mdnsresponder-compat]
-		net-misc/mDNSResponder ) )"
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild
deleted file mode 100644
index 01e6ece86798..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.22.1.ebuild,v 1.2 2011/11/27 19:41:02 voyageur Exp $
-
-EAPI="3"
-
-inherit gnustep-base
-
-DESCRIPTION="A library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="+icu +libffi ssl zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	icu? ( >=dev-libs/icu-4.0 )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
-	libffi? ( virtual/libffi )
-	ssl? ( net-libs/gnutls )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1
-	>=dev-libs/openssl-0.9.7
-	>=sys-libs/zlib-1.2
-	zeroconf? ( || (
-		net-dns/avahi[mdnsresponder-compat]
-		net-misc/mDNSResponder ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	egnustep_env
-
-	local myconf
-	if use libffi;
-	then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
-
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable ssl tls)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
-
-	econf $myconf || die "configure failed"
-}
-
-src_install() {
-	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
-	# environment" including our LD_LIBRARY_PATH, we're left no choice
-	# but doing it like this.
-
-	egnustep_env
-	egnustep_install
-
-	if use doc ; then
-		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
-		egnustep_doc
-	fi
-	egnustep_install_config
-}
-
-pkg_postinst() {
-	ewarn "The shared library version has changed in this release."
-	ewarn "You will need to recompile all Applications/Tools/etc in order"
-	ewarn "to use this library. Please run revdep-rebuild to do so"
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
index 83562b3a74c2..80f0d42da5f1 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.0.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0.ebuild,v 1.1 2012/02/08 14:51:04 voyageur Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.1 2012/02/23 10:09:33 voyageur Exp $
 
+EAPI=4
 inherit gnustep-base
 
 DESCRIPTION="A library of general-purpose, non-graphical Objective C objects."
-
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
 
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="+icu +libffi ssl zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
@@ -28,9 +26,7 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
 	>=dev-libs/gmp-4.1
 	>=dev-libs/openssl-0.9.7
 	>=sys-libs/zlib-1.2
-	zeroconf? ( || (
-		net-dns/avahi[mdnsresponder-compat]
-		net-misc/mDNSResponder ) )"
+	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -52,7 +48,7 @@ src_configure() {
 	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
 	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
 
-	econf $myconf || die "configure failed"
+	econf $myconf
 }
 
 src_install() {