--- ./wxwidgets.eclass	2007-01-02 09:35:49.000000000 +0100
+++ ./wxwidgets2.eclass	2007-05-12 15:26:36.000000000 +0200
@@ -24,30 +24,47 @@
 need-wxwidgets() {
 	debug-print-function $FUNCNAME $*
 	#If you want to use wxGTK-2.6* export WX_GTK_VER in your ebuild:
-	if [ "${WX_GTK_VER}" = "2.6" ]; then
-		case $1 in
-			gtk)		set-wxconfig gtk-ansi;;
-			gtk2)		set-wxconfig gtk2-ansi;;
-			unicode)	set-wxconfig gtk2-unicode;;
-			base)		set-wxconfig base-ansi;;
-			base-unicode)	set-wxconfig base-unicode;;
-			mac)		set-wxconfig mac-ansi;;
-			mac-unicode)	set-wxconfig mac-unicode;;
-			*)		echo "!!! $FUNCNAME: Error: wxGTK was not comipled with $1."
-					echo "!!! Adjust your USE flags or re-emerge wxGTK with version you want."
-			exit 1;;
-		esac
 
+	if [ "${WX_GTK_VER}" = "2.8" ]; then
+                case $1 in
+                        gtk)            wx-config gtk-ansi;;
+                        gtk2)           wx-config gtk2-ansi;;
+                        unicode)        wx-config gtk2-unicode;;
+                        base)           wx-config base-ansi;;
+                        base-unicode)   wx-config base-unicode;;
+                        mac)            wx-config mac-ansi;;
+                        mac-unicode)    wx-config mac-unicode;;
+                        *)              echo "!!! $FUNCNAME: Error: wxGTK was not comipled with $1."
+                                        echo "!!! Adjust your USE flags or re-emerge wxGTK with version you want."
+                        exit 1;;
+                esac
+	
 	else
-		WX_GTK_VER="2.4"
-		case $1 in
-			gtk)		set-wxconfig wxgtk;;
-			gtk2)		set-wxconfig wxgtk2;;
-			unicode)	set-wxconfig wxgtk2u;;
-			*)		echo "!!! $FUNCNAME: Error: wxGTK was not compiled with $1."
-					echo "!!! Adjust your USE flags or re-emerge wxGTK with the version you want."
-			exit 1;;
-		esac
+		if [ "${WX_GTK_VER}" = "2.6" ]; then
+			case $1 in
+				gtk)		set-wxconfig gtk-ansi;;
+				gtk2)		set-wxconfig gtk2-ansi;;
+				unicode)	set-wxconfig gtk2-unicode;;
+				base)		set-wxconfig base-ansi;;
+				base-unicode)	set-wxconfig base-unicode;;
+				mac)		set-wxconfig mac-ansi;;
+				mac-unicode)	set-wxconfig mac-unicode;;
+				*)		echo "!!! $FUNCNAME: Error: wxGTK was not comipled with $1."
+						echo "!!! Adjust your USE flags or re-emerge wxGTK with version you want."
+				exit 1;;
+			esac
+
+		else
+			WX_GTK_VER="2.4"
+			case $1 in
+				gtk)		set-wxconfig wxgtk;;
+				gtk2)		set-wxconfig wxgtk2;;
+				unicode)	set-wxconfig wxgtk2u;;
+				*)		echo "!!! $FUNCNAME: Error: wxGTK was not compiled with $1."
+						echo "!!! Adjust your USE flags or re-emerge wxGTK with the version you want."
+				exit 1;;
+			esac
+		fi
 	fi
 }
 
@@ -56,7 +73,7 @@
 
 	debug-print-function $FUNCNAME $*
 
-	if [ "${WX_GTK_VER}" = "2.6" ] ; then
+	if [ "${WX_GTK_VER}" = "2.6" || "${WX_GTK_VER}" = "2.8" ] ; then
 		wxconfig_prefix="/usr/$(get_libdir)/wx/config"
 		wxconfig_name="${1}-release-${WX_GTK_VER}"
 		wxconfig="${wxconfig_prefix}/${wxconfig_name}"