--- python-2.5.4-r4.ebuild	2010-03-31 04:36:03.000000000 +0200
+++ python-2.5.4-r4.ebuild	2010-04-25 11:28:28.654845000 +0200
@@ -19,7 +19,7 @@
 LICENSE="PSF-2.2"
 SLOT="2.5"
 PYTHON_ABI="${SLOT}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes}
@@ -80,6 +80,15 @@
 		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
 	fi
 
+	# hardcoding GNU specifics breaks platforms not using GNU binutils
+	case $($(tc-getAS) --noexecstack -v 2>&1 </dev/null) in
+		*"GNU Binutils"*) # GNU as with noexecstack support
+			:
+		;;
+		*)
+			EPATCH_EXCLUDE=07_all_ctypes_execstack.patch
+		;;
+	esac
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
 
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
@@ -100,6 +109,43 @@
 		rm Lib/distutils/command/wininst-*.exe
 	fi
 
+	# build static for mint
+	[[ ${CHOST} == *-mint* ]] && epatch "${FILESDIR}"/${PN}-2.5.1-mint.patch
+
+	epatch "${FILESDIR}"/${PN}-2.4.4-darwin-fsf-gcc.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-darwin-bundle.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-darwin-libpython2.5.patch
+	# to build libpython.dylib, we need -fno-common, which python doesn't use,
+	# and to have _NSGetEnviron being used, which by default it isn't...
+	[[ ${CHOST} == *-darwin* ]] && \
+		append-flags -fno-common -DWITH_NEXT_FRAMEWORK
+
+	use prefix && epatch "${FILESDIR}"/${PN}-2.5.1-no-usrlocal.patch
+
+	epatch "${FILESDIR}"/${PN}-2.5.1-darwin-gcc-version.patch
+
+	# set RUNSHARED for 'regen' in Lib/plat-*
+	epatch "${FILESDIR}"/${PN}-2.5.1-platdir-runshared.patch
+
+	epatch "${FILESDIR}"/${PN}-2.5.1-hpux-ldshared.patch
+	epatch "${FILESDIR}"/${PN}-2.4.4-ld_so_aix-which.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-aix-ldshared.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-no-hardcoded-grep.patch
+	epatch "${FILESDIR}"/${P}-irix.patch
+	epatch "${FILESDIR}"/${PN}-2.5.1-distutils-aixnfs.patch
+	epatch "${FILESDIR}"/${PN}-2.5.4-disable-sunaudiodev-bsddb185.patch
+	epatch "${FILESDIR}"/${PN}-2.6.2-solaris64-crypt.patch
+	epatch "${FILESDIR}"/${PN}-2.6.4-netpacket-solaris.patch
+
+	# patch to make python behave nice with interix. There is one part
+	# maybe affecting other x86-platforms, thus conditional.
+	if [[ ${CHOST} == *-interix* ]] ; then
+		epatch "${FILESDIR}"/${PN}-2.5.1-interix.patch
+		# this one could be applied unconditionally, but to keep it
+		# clean, I do it together with the conditional one.
+		epatch "${FILESDIR}"/${PN}-2.5.1-interix-sleep.patch
+	fi
+
 	eautoreconf
 }
 
@@ -134,6 +180,9 @@
 		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
 	fi
 
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
 	fi
@@ -171,6 +220,13 @@
 	# Please query BSD team before removing this!
 	append-ldflags "-L."
 
+	# python defaults to use 'cc_r' on aix
+	[[ ${CHOST} == *-aix* ]] && myconf="${myconf} --with-gcc=$(tc-getCC)"
+	# http://bugs.python.org/issue4026
+	if [[ ${CHOST} == *-aix6* ]]; then
+		sed -i -e 's:-lm :-lm -lbsd :' Modules/ld_so_aix || die "sed failure"
+	fi
+
 	econf \
 		--with-fpectl \
 		--enable-shared \
@@ -186,6 +242,10 @@
 src_compile() {
 	src_configure
 	emake || die "emake failed"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# create libpython on Darwin
+		emake libpython2.5.dylib || die
+	fi
 }
 
 src_test() {
@@ -231,27 +291,28 @@
 }
 
 src_install() {
+	[[ ${CHOST} == *-mint* ]] && keepdir /usr/lib/python${PYVER}/lib-dynload/
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
 
-	mv "${D}usr/bin/python${SLOT}-config" "${D}usr/bin/python-config-${SLOT}"
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
 
 	# Fix collisions between different slots of Python.
-	mv "${D}usr/bin/pydoc" "${D}usr/bin/pydoc${SLOT}"
-	mv "${D}usr/bin/idle" "${D}usr/bin/idle${SLOT}"
-	mv "${D}usr/share/man/man1/python.1" "${D}usr/share/man/man1/python${SLOT}.1"
-	rm -f "${D}usr/bin/smtpd.py"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1"
+	rm -f "${ED}usr/bin/smtpd.py"
 
 	# Fix the OPT variable so that it doesn't have any flags listed in it.
 	# Prevents the problem with compiling things with conflicting flags later.
-	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile"
+	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${ED}$(python_get_libdir)/config/Makefile"
 
-	if use build; then
-		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
+	if use build ; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
 	else
-		use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/"{bsddb/test,test}
-		use berkdb || rm -fr "${D}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
-		use sqlite || rm -fr "${D}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{idlelib,lib-tk}
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
+		use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
 	fi
 
 	prep_ml_includes $(python_get_includedir)