econf || die, sync IUSE, glibc -> libc

6 files changed, 20 insertions, 16 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 291b3002cb74..d6e32d9542e0 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.53 2004/06/24 22:08:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.54 2004/06/28 19:38:10 agriffis Exp $
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.0.ebuild,
+  wxGTK-2.4.2-r1.ebuild, wxGTK-2.4.2.ebuild, wxGTK-2.5.1.ebuild:
+  econf || die, sync IUSE, glibc -> libc
 
   23 Jun 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.0.ebuild,
   wxGTK-2.4.1-r1.ebuild, wxGTK-2.5.1.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 7b3721b66ea1..c9fd552dded9 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,9 +1,9 @@
 MD5 ccc15becc6a3225ece92779b66bff850 wxGTK-2.4.1-r1.ebuild 2704
-MD5 1828d69a96075b790203fe2d2ec59b29 wxGTK-2.5.1.ebuild 2077
-MD5 f05ebb9471f9836ce47dd47810535ba1 wxGTK-2.4.0.ebuild 2705
-MD5 04ec9857f780b951cc8c179d05f29005 wxGTK-2.4.2.ebuild 2488
-MD5 bda7051c00634736cd970dc650fa76c8 wxGTK-2.4.2-r1.ebuild 2652
-MD5 5f27635f92e12bf5b9ed7ce7fd27427d ChangeLog 8973
+MD5 0e559ff4397e1f317071e5ff07f12146 wxGTK-2.5.1.ebuild 2089
+MD5 7ac14ec5e6780c256bb394338939fb11 wxGTK-2.4.0.ebuild 2711
+MD5 6fd93dfb815c37ccb3319d46752d2bb3 wxGTK-2.4.2.ebuild 2482
+MD5 f012d0bd4de9b49b3bdc6e3377af912a wxGTK-2.4.2-r1.ebuild 2646
+MD5 f2c8c3d3f9a6f152614c215e52eb82e9 ChangeLog 9150
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
diff --git a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
index 9562f2f2e0ae..5ce4d942cefc 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.0.ebuild,v 1.18 2004/06/24 22:08:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.0.ebuild,v 1.19 2004/06/28 19:38:10 agriffis Exp $
 
 DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit."
 SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
@@ -9,9 +9,9 @@ HOMEPAGE="http://www.wxwindows.org/"
 LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE="nls odbc opengl gtk2"
+IUSE="gtk2 nls odbc opengl static"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
 	media-libs/netpbm
 	media-libs/giflib
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild
index 70c5e8c915be..a99717d5ec46 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild,v 1.2 2004/06/24 22:08:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild,v 1.3 2004/06/28 19:38:10 agriffis Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
 LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc alpha arm amd64 ia64"
-IUSE="odbc opengl gtk2 unicode debug"
+IUSE="gtk2 odbc opengl unicode"
 
 RDEPEND="virtual/x11
 	sys-libs/zlib
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild
index 4d217d6d7695..a7ff1d7a4f35 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2.ebuild,v 1.14 2004/06/24 22:08:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2.ebuild,v 1.15 2004/06/28 19:38:10 agriffis Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
 LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc alpha arm amd64 ia64"
-IUSE="odbc opengl gtk2 unicode debug"
+IUSE="gtk2 odbc opengl unicode"
 
 RDEPEND="virtual/x11
 	sys-libs/zlib
diff --git a/x11-libs/wxGTK/wxGTK-2.5.1.ebuild b/x11-libs/wxGTK/wxGTK-2.5.1.ebuild
index 3edfa87f5eb3..c6f685d97cd8 100644
--- a/x11-libs/wxGTK/wxGTK-2.5.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.5.1.ebuild,v 1.3 2004/06/24 22:08:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.5.1.ebuild,v 1.4 2004/06/28 19:38:10 agriffis Exp $
 
 DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit."
 SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.wxwindows.org/"
 LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="nls odbc opengl gtk2 unicode debug"
+IUSE="gtk2 odbc opengl unicode"
 
 RDEPEND="virtual/x11
 	sys-libs/zlib
@@ -57,7 +57,7 @@ src_compile() {
 		myconf="${myconf} `use_with odbc`"
 	fi
 
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	emake || die "make failed"
 
 	cd ${S}/contrib/src