--- /usr/portage/dev-lang/python/python-3.2-r1.ebuild	2011-07-22 17:53:21.000000000 -0700
+++ python-3.2-r1.ebuild	2011-07-24 02:08:13.732091578 -0700
@@ -132,6 +132,9 @@
 		sed -e "s/\(-DSVNVERSION=\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2/" -i Makefile.pre.in || die "sed failed"
 	fi
 
+	#Linux-3 compat. Bug #374579 (upstream issue12571)
+	cp -r ${S}/Lib/plat-linux2 ${S}/Lib/plat-linux3 || die "copy plat-linux failed"
+
 	eautoreconf
 }
 
@@ -296,8 +299,14 @@
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
 	#Linux-3 compat. Bug #374579 (upstream issue12571)
-	cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+	if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
+		cp -r "${ED}$(python_get_libdir)/plat-linux2" \
 			"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
+	else
+		cp -r "${ED}$(python_get_libdir)/plat-linux3" \
+			"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+	fi
+
 
 	sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 }