Properly work-around for bug #100698.

(Portage version: 2.0.51.22-r2)

5 files changed, 15 insertions, 27 deletions

diff --git a/net-wireless/wireless-tools/ChangeLog b/net-wireless/wireless-tools/ChangeLog
index 3e3d8893aeb0..eb82a8e78944 100644
--- a/net-wireless/wireless-tools/ChangeLog
+++ b/net-wireless/wireless-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wireless-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.76 2005/07/29 21:39:44 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.77 2005/07/30 08:44:19 brix Exp $
+
+  30 Jul 2005; Henrik Brix Andersen <brix@gentoo.org> metadata.xml,
+  wireless-tools-27-r1.ebuild, wireless-tools-28_pre8-r1.ebuild:
+  Properly work-around for bug #100698.
 
   29 Jul 2005; <solar.@gentoo.org> wireless-tools-27-r1.ebuild,
   wireless-tools-28_pre8-r1.ebuild:
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index b78cbbb00bdf..8faded089b54 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 15eda75ecfa1e38b4babdbb873687462 wireless-tools-28_pre8-r1.ebuild 2458
+MD5 c65d51fa95076a2d89189d00e45b9348 wireless-tools-28_pre8-r1.ebuild 2465
 MD5 bcc422550f3cbdd729b22bb75d540eea ChangeLog 13368
-MD5 6ca2782eae77e1a438264b0b217c243e metadata.xml 722
-MD5 f35edab5748de4283c4e4fc1acc9b808 wireless-tools-27-r1.ebuild 1404
+MD5 090667c70477a1c3090045d2d962d4d5 metadata.xml 581
+MD5 e1b6b56c171f8f9ce9bea87bf7894a67 wireless-tools-27-r1.ebuild 1410
 MD5 7c44525122efc01a49db2723c5f0d5c6 files/digest-wireless-tools-27-r1 69
 MD5 cb933019a030518be5e16a58d45f6145 files/digest-wireless-tools-28_pre8-r1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iQCVAwUBQuqhb54WFLgrx1GWAQIzWAQAqAHMuc8lqmk/sGgcUUzYm3ggZ/Qtr7PZ
-3XwuY79+49N1hN9VzYGEYSvZKeAs/Rgwu+zUfPx1jm5Q6fj6+H3nrscTgS2gidVN
-H8uDkla39l+MJHBnGzqCo2IOceI3pV4ShVJuD52Rlt2ptphKKpjLZY3IwKRNa0BM
-jxx2gAbQjrI=
-=ZeU+
------END PGP SIGNATURE-----
diff --git a/net-wireless/wireless-tools/metadata.xml b/net-wireless/wireless-tools/metadata.xml
index b2258a3da334..03b3548a6c99 100644
--- a/net-wireless/wireless-tools/metadata.xml
+++ b/net-wireless/wireless-tools/metadata.xml
@@ -11,10 +11,5 @@
   <email>brix@gentoo.org</email>
   <name>Henrik Brix Andersen</name>
 </maintainer>
-<maintainer>
-  <email>solar@gentoo.org</email>
-  <name>Ned Ludd</name>
-  <description>embedded - minimal support</description>
-</maintainer>
 <longdescription>This package provides all the command line tools for configuring wireless networking devices with drivers that implement the Linux Wireless Extensions (almost all recent IEEE 802.11a/b/g drivers).</longdescription>
 </pkgmetadata>
diff --git a/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild
index 4fcc0d367ebd..61ed947e4e98 100644
--- a/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-27-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-wireless/wireless-tools/wireless-tools-27-r1.ebuild,v 1.4 2005/07/29 21:39:44 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-27-r1.ebuild,v 1.5 2005/07/30 08:44:19 brix Exp $
 
 # The following works with both pre-releases and releases
 MY_P=${PN/-/_}.${PV/_/.}
@@ -14,8 +14,8 @@ KEYWORDS="amd64 hppa ~mips ppc ppc64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-# Please stop breaking these depends. -solar
-DEPEND="sys-apps/sed"
+DEPEND="sys-apps/sed
+		!elibc_uclibc? ( >=sys-apps/baselayout-1.11.13 )"
 RDEPEND="virtual/libc"
 IUSE="nls"
 
diff --git a/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild
index 05fda18f7fc5..9d3e009afbe0 100644
--- a/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-28_pre8-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-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild,v 1.2 2005/07/29 21:39:44 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-28_pre8-r1.ebuild,v 1.3 2005/07/30 08:44:19 brix Exp $
 
 inherit toolchain-funcs multilib
 
@@ -15,8 +15,9 @@ HOMEPAGE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-# Please stop breaking these depends. -solar
-DEPEND="sys-apps/sed"
+
+DEPEND="sys-apps/sed
+		!elibc_uclibc? ( >=sys-apps/baselayout-1.11.13 )"
 RDEPEND="virtual/libc"
 IUSE="multicall nls"