Update zeroconf dependencies (bug #405383), remove old unstable version

Package-Manager: portage-2.2.0_alpha88/cvs/Linux x86_64

6 files changed, 25 insertions, 116 deletions

diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index 8421b497157c..db8c948386ed 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST gnustep-back-0.18.0.tar.gz 901329 RMD160 b39737fc46e18f1591950b89c4ff5ea6142e4778 SHA1 7b6d46976bd56496d0715c4e150b85c924658b60 SHA256 4ebbfcdccdc38027b3222c44f06d387d6853b95551f9b210271aa9d8bd0ef616
-DIST gnustep-back-0.20.1.tar.gz 918769 RMD160 fa2b9ea175d37e75ccd6ae8b02e6f3e89d52ca40 SHA1 15ff3af2c0f539983a7c4b02bedb07efd92d38f5 SHA256 1644b601052d6d1942c0c8945946f479068b873d0e3e3f99bcb98bc7a18f406e
 DIST gnustep-back-0.22.0.tar.gz 935034 RMD160 c71b4d610fc010ed9fb055565fc4cfa04584588d SHA1 da21dbb7844fb5acecf0323daf35392c11a1e4af SHA256 b9bf26346737d87160af669c3073b4eb511c743056af90aedb631e1537513608
 EBUILD gnustep-back-xlib-0.18.0.ebuild 1264 RMD160 0f8948f88737843aed63fe6b0b1349f78e30b464 SHA1 61e58817e456dafe8655f460f1ed5fdd4f7e98d9 SHA256 2db2da35e0d0c683ac525b45956bb75f951ebeb39af67b573e70c8e2111eb044
-EBUILD gnustep-back-xlib-0.20.1.ebuild 1274 RMD160 1631df840d80c9c82276c42e0abf57446639b474 SHA1 6d677f14cc73b08aaf00ee8d220e2b2ad27945c9 SHA256 9eef11fba83475b550c856d2f4ee149805a1c833b1b631e05ea54f47b742a2c7
 EBUILD gnustep-back-xlib-0.22.0.ebuild 1204 RMD160 38b3a6890fe88dc46d8e3dae67e910c4514b5b77 SHA1 f20b98b4d017dd9861598868f8736a2c41046dcd SHA256 0d739e9647ad83a47bf32c22a6dcc5ca7cc9d8bb5a5e133ab8a6a09f6c6b8f78
-MISC ChangeLog 10518 RMD160 5682b4d72f6425fe10ff7cb8863fec8a274c8dff SHA1 fab5627d97c146ccf527be4c723ece81044e4bc1 SHA256 9f2a3341435e5b449cd0ac71352f2bbf9a847baa5babe358cd4a250f0af0c262
+MISC ChangeLog 10640 RMD160 20bc1e67a8744f37aa68170ea7c6b303d2bd1273 SHA1 e90dab1d1b4b95e44bedd064df0d8e9d68e09c1c SHA256 a7ee21ae31ff925a5f4b9c695b55ba2babdbd162f47d1a06112d4578d810550c
 MISC metadata.xml 1088 RMD160 50c9e0ee6f90bd1afe1ca57f0b264f1c93ad5a16 SHA1 49e1387b3b3cab2fec4b16168da0cc67064eff47 SHA256 7abfae5d833d4d8834e20b0fe018b6395bb110cafe7adf8c1a96eca2217e72c3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk8+Mk0ACgkQFYEBGcdFJfK3zAD+NFEmwg14gCfAiRDCK0k67B7r
-uaPyaZf0JUlwx0IXWEEA/1r4MayPabHxbfmQn7hJHXdfl9a6ccxgwBxEWd2qWfiv
-=grCM
------END PGP SIGNATURE-----
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/Manifest b/gnustep-base/gnustep-base/Manifest
index 1d74a2a3e5c0..3544ef8ee633 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -3,17 +3,15 @@ Hash: SHA256
 
 AUX 50-gnustep-revdep 35 RMD160 f9508891da2de58ef884baabf9206577653a409b SHA1 40e21ae24078afb92067f51ca82722f20b742512 SHA256 e0bde19a964f2ae01855b4353c3d2af7b0b0ca25231827798ebfea16e435d3a2
 DIST gnustep-base-1.20.1.tar.gz 2612827 RMD160 3f210ac74bf633bf1b5571ee3458e6db4f6d57b1 SHA1 5aff36405aa712473d51877ab77156d231297744 SHA256 fd495d7d800078f7fea7528472d5683899fb93f0270fe7e70f92cf310cd43610
-DIST gnustep-base-1.22.1.tar.gz 2887529 RMD160 822e800247ae50308d6bca766ace4eab276ea18a SHA1 61d61ca127a1beb580b9dfce3d907cfa6c98e881 SHA256 246819d15aa2b836a5e36405a52f73340cded8ff0039dd584288ba52bbe9d880
 DIST gnustep-base-1.24.0.tar.gz 2947759 RMD160 3710966cac708c5f22b1e5eaee456951791a1620 SHA1 4d73df5b5a594213a4c7a0ed97fc04d10c9ced69 SHA256 e07040e85a6bf3e89a9d66424a40dc8d3be749fbe7c0c98942cff5e4f35a6b11
-EBUILD gnustep-base-1.20.1.ebuild 2560 RMD160 822de32883cbcc824f3ad79917fb47cea3cb000c SHA1 dbe74e4d7f051a4fac63537d0e28cf9046adf102 SHA256 19de7997f02317842de202245c6dc18315d72ca8dab5fa466710df99bdfda664
-EBUILD gnustep-base-1.22.1.ebuild 2342 RMD160 e255e57c721cfc2ec6c96914fc8ba4380fc4f7fd SHA1 b75f0780759f30d635af8831972a709ea5869c4a SHA256 849d451edd24155063740a87ea2dfef0404ec24bf8a71dbe0afe48fccf3cd6d1
-EBUILD gnustep-base-1.24.0.ebuild 2342 RMD160 674b5e2a75a7929927f04fa58fa10504ed578d33 SHA1 9a5e3071a8bb18835b929ae0ff1fa9db5e606b66 SHA256 2cbd6925892899695c0b846197ffb53b4af731ed010e8f826028bce3e818a3d5
-MISC ChangeLog 22219 RMD160 e9c1bd192a7671956445b91afbc3dd9c985da988 SHA1 eb3eb053b74b3217c2882640f17c81cbb82f4451 SHA256 7affb7e1ceab61dbccd7467beac7ada0589a864cc354d9c92922491e2051ac00
+EBUILD gnustep-base-1.20.1.ebuild 2526 RMD160 7731aad673fbc169c80557aff3bd607e19f8b9bc SHA1 e1b451f129bbcce4d6888767743fc19c311dd2a0 SHA256 b5801cbba25a0ff495cd086d304191374ac733e5a00bf4415d6d2d704cc7c06a
+EBUILD gnustep-base-1.24.0-r1.ebuild 2259 RMD160 416ef7df9f7593f5484fde7c9b7529da0bc31a57 SHA1 94f0a94d8570cdb801db021296b1b32c58066412 SHA256 dd7878c6ca66e71a276ebb007238fdf0eb0946ee0b261209dc96e4e35f1247f2
+MISC ChangeLog 22510 RMD160 9572bae0a25b15afe6fb44af8755bad5daa5944f SHA1 f56e41ba66d78ed3d1d18cd5bd00a647836363a7 SHA256 d09f351f4b0f84c9a7cb6e6f9f2a938649f3b4cf797e251dbbc63036de411612
 MISC metadata.xml 670 RMD160 5d5b88faf28b66aa5d5d3efd6fe5844e980604c9 SHA1 9582400efd6733f27beaf47fa801065838d86955 SHA256 e08343661cc7ecb6d963be62092a270a45f8af0201c9523d1feeddfa09a417fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8yi+IACgkQFYEBGcdFJfILdwD/Zi8HpEzX5d1sOnfqkpdqAGx5
-oqmJSwB/zkzvrbvvPeUA/A5I1rHqqOAv4YSz7L63Qd/MYcZ84OFQuvZxS3beAU5O
-=IPJp
+iF4EAREIAAYFAk9GEGYACgkQFYEBGcdFJfLYZQEAgC7R2fba5Rz80UT3kYufQI36
+B64MPR7+K5DwzJAMWdQA/0XWAaKicG3LeD0LkcbzFFaxQ06Q5sjnFDWK7dSja55d
+=4SN7
 -----END PGP SIGNATURE-----
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() {