--- /tmp/python3-3.1.5rc1-1/python3-3.1.5rc1-1.cygport	2012-06-12 09:51:05.788750000 -0400
+++ python3.cygport	2012-06-14 13:47:29.445000000 -0400
@@ -1,4 +1,4 @@
-doc_v=3.1.3
+doc_v=${PV}
 gentoo_overlay="http://overlays.gentoo.org/proj/python/browser/patches"
 
 DESCRIPTION="Python programming language"
@@ -6,7 +6,6 @@
 SRC_URI="http://www.python.org/ftp/python/${PV%rc*}/Python-${PV}.tar.bz2
          http://docs.python.org/py3k/archives/python-${doc_v}-docs-html.tar.bz2"
 PATCH_URI="
-	${gentoo_overlay}/3.0/22_all_internal-expat.patch?format=txt
 	3.1-dbm.patch
 	3.1-enable-new-dtags.patch
 	3.0b3-tkinter.patch
@@ -15,10 +14,14 @@
 	3.1-ssl-threads.patch
 	3.1-system-libffi.patch
 	3.1-ncurses-abi6.patch
-	3.1-export-PySignal_SetWakeupFd.patch
-	3.2.3-plat-cygwin.patch
+	3.2.3-export-PySignal_SetWakeupFd.patch
+	3.2.3-extension.patch
+	3.2.3-libpython-abi.patch
 "
+#	${gentoo_overlay}/3.0/22_all_internal-expat.patch?format=txt
+#	2.6.5-platdir.patch
 #	3.0b3-ossaudio.patch
+#	3.2.3-plat-cygwin.patch
 
 SRC_DIR="Python-${PV}"
 
@@ -29,10 +32,10 @@
 
 PKG_NAMES="${PN} ${PN}-test ${PN}-tkinter idle3 ${PN}-doc"
 PKG_HINTS="setup test tkinter idle doc"
-python3_CONTENTS="--exclude=idle3 --exclude=idlelib --exclude=htmldocs
+python3_CONTENTS="--exclude=idle3* --exclude=idlelib --exclude=htmldocs
                   --exclude=_tkinter.dll --exclude=tkinter
                   --exclude=test --exclude=tests usr/"
-idle3_CONTENTS="usr/bin/idle3 ${pyrootdir#/}/idlelib/"
+idle3_CONTENTS="usr/bin/idle3* ${pyrootdir#/}/idlelib/"
 python3_doc_CONTENTS="usr/share/doc/${PN}/htmldocs/"
 python3_test_CONTENTS="${pyrootdir#/}/*/test*/ ${pyrootdir#/}/test/"
 python3_tkinter_CONTENTS="--exclude=test ${pydylddir#/}/_tkinter.dll ${pyrootdir#/}/tkinter/"
@@ -57,11 +60,17 @@
 	dodir /usr
 	cygmake -j1 DESTDIR=${D} altinstall maninstall
 
-	dosym python${slot}.exe /usr/bin/python3
-	dosym python${slot}-config /usr/bin/python3-config
+	abi=$(${B}/python.exe -c 'import sys; print(sys.abiflags)')
+
+	dosym python${slot}${abi}.exe /usr/bin/python3
+	dosym python${slot}${abi}-config /usr/bin/python3-config
 	dosym python-${slot}.pc /usr/lib/pkgconfig/python3.pc
 
-	dosym python${slot}/config/libpython${slot}.dll.a /usr/lib/libpython${slot}.dll.a
+	dosym python${slot}/config-${slot}${abi}/libpython${slot}${abi}.dll.a /usr/lib/libpython${slot}${abi}.dll.a
+
+	dosym idle${slot} /usr/bin/idle3
+
+	dosym python${slot}.1 /usr/share/man/man1/python3.1
 
 	dodir /usr/share/doc/${PN}/htmldocs
 	cp -r ${S}/../python-${doc_v}-docs-html/* ${D}/usr/share/doc/${PN}/htmldocs/