--- freecad-0.13.1830.ebuild.orig	2014-03-04 05:50:07.000000000 +0400
+++ freecad-0.13.1830.ebuild	2014-03-04 05:06:42.470743416 +0400
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830.ebuild,v 1.2 2013/05/09 08:36:38 xmw Exp $
 
 EAPI=5
 
-PYTHON_DEPEND=2
+PYTHON_COMPAT=( python2_{6,7} )
 
-inherit eutils multilib fortran-2 python cmake-utils
+inherit cmake-utils eutils fortran-2 multilib python-single-r1
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="http://www.freecadweb.org/"
@@ -34,7 +34,8 @@
 	sci-libs/gts
 	sci-libs/opencascade:=
 	sys-libs/zlib
-	virtual/glu"
+	virtual/glu
+	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
 	dev-qt/assistant:4
 	dev-python/pycollada
@@ -56,7 +57,7 @@
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	python_set_active_version 2
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -82,7 +83,7 @@
 	einfo "Patching cMake/FindCoin3DDoc.cmake ..."
 	local my_coin_version=$(best_version media-libs/coin)
 	local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
-    sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \
+	sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \
 		-i cMake/FindCoin3DDoc.cmake || die
 }
 
@@ -140,6 +141,8 @@
 	dodoc README.Linux ChangeLog.txt
 
 	# disable compression of QT assistant help files
-	>> ${ED}usr/share/doc/${P}/freecad.qhc.ecompress.skip
-	>> ${ED}usr/share/doc/${P}/freecad.qch.ecompress.skip
+	>> "${ED}usr/share/doc/${P}/freecad.qhc.ecompress.skip"
+	>> "${ED}usr/share/doc/${P}/freecad.qch.ecompress.skip"
+
+	python_optimize "${D}"/usr/{"$(get_libdir)",share}/"${P}"/Mod/
 }