Index: wxpython-2.8.12.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v
retrieving revision 1.15
diff -u -B -r1.15 wxpython-2.8.12.1.ebuild
--- wxpython-2.8.12.1.ebuild	29 May 2012 14:46:19 -0000	1.15
+++ wxpython-2.8.12.1.ebuild	12 Jun 2012 03:26:32 -0000
@@ -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
@@ -65,9 +68,6 @@
 	fi
 
 	python_copy_sources
-
-	# Workaround, buildsystem uses CFLAGS as CXXFLAGS
-	export CFLAGS="${CXXFLAGS}"
 }
 
 src_configure() {
@@ -75,7 +75,7 @@
 
 	DISTUTILS_GLOBAL_OPTIONS=(
 		"* WX_CONFIG=${WX_CONFIG}"
-		"* WXPORT=gtk2"
+		"* WXPORT=$(use aqua && echo mac || echo gtk2)"
 		"* UNICODE=1"
 		"* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)"
 	)
@@ -96,7 +96,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
 	}
@@ -105,27 +105,20 @@
 	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
 
 	insinto /usr/share/applications
-	doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
+	doins distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
 	insinto /usr/share/pixmaps
-	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}
+	newins wx/py/PyCrust_32.png PyCrust.png
+	newins wx/tools/XRCed/XRCed_32.png XRCed.png
 
 	if use doc; then
-		dodir /usr/share/doc/${PF}/docs
-		cp -R "${DOC_S}"/docs/* "${docdir}"/docs/
+		dodoc -r "${DOC_S}"/docs
 		# For some reason newer API docs aren't available so use 2.8.9.2's
-		cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${docdir}"/docs/
+		dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs
 	fi
 
 	if use examples; then
-		dodir /usr/share/doc/${PF}/demo
-		cp -R "${DOC_S}"/demo/* "${docdir}"/demo
-		dodir /usr/share/doc/${PF}/samples
-		cp -R "${DOC_S}"/samples/* "${docdir}"/samples
-		[[ -e ${docdir}/samples/embedded/embedded ]] \
-			&& rm -f "${docdir}"/samples/embedded/embedded
+		dodoc -r "${DOC_S}"/demo
+		dodoc -r "${DOC_S}"/samples
 	fi
 }