--- wxGTK-2.4.1-r1.ebuild.orig	2003-09-10 06:39:56.000000000 +0200
+++ wxGTK-2.4.1-r1.ebuild	2003-10-02 23:29:00.000000000 +0200
@@ -11,18 +11,19 @@
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="nls odbc opengl gtk2"
 
-DEPEND="virtual/x11
-	media-libs/netpbm
-	media-libs/giflib
+RDEPEND="virtual/x11
+	sys-libs/zlib
 	media-libs/libpng
 	media-libs/jpeg
 	media-libs/tiff
-	sys-libs/zlib
 	odbc? ( dev-db/unixODBC  )
 	opengl? ( virtual/opengl )
-	gtk2? ( >=x11-libs/gtk+-2.0* dev-libs/libunicode ) : ( =x11-libs/gtk+-1.2* )"
+	gtk2? ( >=x11-libs/gtk+-2.0* ) : ( =x11-libs/gtk+-1.2* )"
+
+	# Note: gettext is not runtime dependency even if nls? because wxWindows
+	#       has its own implementation of it
 
-RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -33,9 +34,8 @@
 
 src_compile() {
 	local myconf
-	myconf="--enable-gif --with-libtiff --with-zlib --with-libpng \
-		--enable-png --with-libjpeg"
-
+	myconf=""
+	
 	#Note: pcx image support enabled by default if found.
 	#Also, all wxWindows gui features are enabled by default. If you
 	#want to build a smaller library you can disable features by adding
@@ -48,17 +48,25 @@
 	#       We only use --enable-unicode (if at all) when we use
 	#       gtk2.
 
+   # Note: this ebuild no longer builds wxGTK with --enable-unicode --> commented out,
+	#       should be restored when this changes
 
-	if [ `use odbc` ] && [ ! `use gtk2` ]; then
+	#if [ `use odbc` ] && [ ! `use gtk2` ]; then
+	#	myconf="${myconf} --with-odbc"
+	#elif [ `use odbc` ] && [ `use gtk2` ]; then
+	#	ewarn ""
+	#	einfo "you cannot specify both odbc and gtk2"
+	#	einfo "Choosing gtk2 over odbc"
+	#	einfo "re-run with USE=\"-gtk2\" to enable odbc"
+	#	ewarn ""
+	#	sleep 5
+	#	myconf="${myconf} --without-odbc"
+	#else
+	#	myconf="${myconf} --without-odbc"
+	#fi
+	
+	if [ `use odbc` ]; then
 		myconf="${myconf} --with-odbc"
-	elif [ `use odbc` ] && [ `use gtk2` ]; then
-		ewarn ""
-		einfo "you cannot specify both odbc and gtk2"
-		einfo "Choosing gtk2 over odbc"
-		einfo "re-run with USE=\"-gtk2\" to enable odbc"
-		ewarn ""
-		sleep 5
-		myconf="${myconf} --without-odbc"
 	else
 		myconf="${myconf} --without-odbc"
 	fi