Don't use poll() on Mac OS X 10.4; bug #95515. Thanks to Kito <kito@gentoo.org>.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 26 insertions, 23 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 9ec9aeacfd5b..826a9b8c6d13 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.87 2005/06/14 19:51:54 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.88 2005/06/18 16:42:02 usata Exp $
+
+  18 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> zsh-4.2.5.ebuild:
+  Don't use poll() on Mac OS X 10.4; bug #95515. Thanks to Kito
+  <kito@gentoo.org>.
 
   14 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> zsh-4.2.5.ebuild:
   Stable on alpha
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 463fd3f7390e..20fa4fb2ffda 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 97f7ff7dc64552dc56f3b8b677d49328 zsh-4.2.5.ebuild 4308
-MD5 28ae3771eb1a6ebb64171197c8d390e7 zsh-4.0.9-r4.ebuild 2893
-MD5 94f8381cc21da147fc0975a5d208f637 zsh-4.2.4.ebuild 4307
-MD5 514d54d78728aaf1a93430b2f949cec2 ChangeLog 13981
+MD5 f9443c3138f4835f987c5359222e219d zsh-4.2.5.ebuild 4512
+MD5 3cc65379e1e66ab0f0ec802341eef4d8 ChangeLog 14134
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
-MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
-MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389
+MD5 94f8381cc21da147fc0975a5d208f637 zsh-4.2.4.ebuild 4307
+MD5 28ae3771eb1a6ebb64171197c8d390e7 zsh-4.0.9-r4.ebuild 2893
+MD5 1710d7b038f0aac2aca3520bb546659c files/digest-zsh-4.2.5 199
 MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
+MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
+MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
 MD5 9001ff5324448d902a296276500ac3fb files/digest-zsh-4.2.4 199
-MD5 1710d7b038f0aac2aca3520bb546659c files/digest-zsh-4.2.5 199
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrzWOViELBEf1JB0RAnNfAJ9tDJCF4XXQR57ETtSvcb9fAo5vdgCfRGUf
-2KJYFKesT6K8XxgsrRqkyQs=
-=NhOA
------END PGP SIGNATURE-----
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
+MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
+MD5 eaa2f7dff9e7ca62087f9786cea84897 files/zsh-init.d-gentoo.diff 1389
diff --git a/app-shells/zsh/zsh-4.2.5.ebuild b/app-shells/zsh/zsh-4.2.5.ebuild
index ec32897926c7..debbd85d0b14 100644
--- a/app-shells/zsh/zsh-4.2.5.ebuild
+++ b/app-shells/zsh/zsh-4.2.5.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/app-shells/zsh/zsh-4.2.5.ebuild,v 1.8 2005/06/14 19:51:54 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.5.ebuild,v 1.9 2005/06/18 16:42:02 usata Exp $
 
 inherit eutils
 
@@ -78,12 +78,21 @@ src_compile() {
 			Makefile || die
 	fi
 
+	# hack for Darwin8 broken poll()
+	if use ppc-macos ; then
+		sed -i -e "s/define HAVE_POLL_H/undef HAVE_POLL_H/g" \
+			-e "s/define HAVE_POLL/undef HAVE_POLL/g" \
+			config.h
+	fi
+
 	# emake still b0rks
 	emake -j1 || die "make failed"
 }
 
 src_test() {
-	addpredict /dev/ptmx
+	for f in /dev/pt* ; do
+		addpredict $f
+	done
 	make check || die "make check failed"
 }