--- /usr/portage/dev-python/wxpython/wxpython-2.8.12.1.ebuild	2012-05-29 09:01:12.000000000 -0600
+++ wxpython-2.8.12.1.ebuild	2012-08-31 20:59:21.000000000 -0600
@@ -21,17 +21,19 @@
 
 LICENSE="wxWinLL-3"
 SLOT="2.8"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cairo doc examples opengl"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aqua cairo doc examples opengl"
 
 RDEPEND="
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
+	aqua? ( >=dev-lang/python-2.6[aqua?]
+		>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,aqua=] )
+	!aqua? ( >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] )
 	dev-libs/glib:2
 	dev-python/setuptools
 	media-libs/libpng:0
 	media-libs/tiff:0
 	virtual/jpeg
-	x11-libs/gtk+:2
+	x11-libs/gtk+:2[aqua=]
 	x11-libs/pango[X]
 	cairo?	( >=dev-python/pycairo-1.8.4 )
 	opengl?	( dev-python/pyopengl )"
@@ -57,6 +59,7 @@
 	if use doc; then
 		cd "${DOC_S}"
 		epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch
+		[[ -e samples/embedded/embedded ]] && rm -f samples/embedded/embedded
 	fi
 
 	if use examples; then
@@ -75,7 +78,7 @@
 
 	DISTUTILS_GLOBAL_OPTIONS=(
 		"* WX_CONFIG=${WX_CONFIG}"
-		"* WXPORT=gtk2"
+		"* WXPORT=$(usex aqua mac gtk2)"
 		"* UNICODE=1"
 		"* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)"
 	)
@@ -96,7 +99,7 @@
 
 	# Collision protection.
 	rename_files() {
-		for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do
+		for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do
 			mv "${file}" "${file}-${SLOT}" || return 1
 		done
 	}
@@ -110,7 +113,7 @@
 	newins "${S}"/wx/py/PyCrust_32.png PyCrust.png
 	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
 
-	docdir=${D}usr/share/doc/${PF}
+	docdir=${ED}usr/share/doc/${PF}
 
 	if use doc; then
 		dodir /usr/share/doc/${PF}/docs
@@ -148,19 +151,19 @@
 	echo
 	if use doc; then
 		elog "To access the general wxWidgets documentation, run"
-		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
+		elog "${EROOT}usr/share/doc/${PF}/docs/viewdocs.py"
 		elog
 		elog "wxPython documentation is available by pointing a browser"
-		elog "at /usr/share/doc/${PF}/docs/api/index.html"
+		elog "at ${EROOT}usr/share/doc/${PF}/docs/api/index.html"
 	fi
 	if use examples; then
 		elog
 		elog "The demo.py app which contains hundreds of demo modules"
 		elog "with documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
+		elog "${EROOT}usr/share/doc/${PF}/demo/demo.py"
 		elog
 		elog "Many more example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
+		elog "${EROOT}usr/share/doc/${PF}/samples/"
 		echo
 	fi
 	elog "Editra is not packaged with wxpython in Gentoo."