--- /usr/portage/net-fs/samba/samba-4.0.1.ebuild	2013-01-22 02:01:23.000000000 +0400
+++ samba-4.0.1-r1.ebuild	2013-01-27 15:05:11.920536034 +0400
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.1.ebuild,v 1.2 2013/01/21 21:43:47 vostorga Exp $
+# $Header: $
 
-EAPI=4
-PYTHON_DEPEND="2"
+EAPI=5
+PYTHON_COMPAT="python2_7"
 
-inherit python waf-utils multilib linux-info
+inherit python-r1 waf-utils multilib linux-info
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -28,11 +28,11 @@
 IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
 ldap pam quota selinux swat syslog winbind"
 
-RDEPEND="dev-libs/iniparser
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/iniparser
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
-	>=dev-lang/python-2.4.2
 	dev-python/subunit
 	sys-libs/libcap
 	>=sys-libs/ldb-1.1.13
@@ -41,6 +41,7 @@
 	>=sys-libs/tevent-0.9.17
 	sys-libs/zlib
 	>=app-crypt/heimdal-1.5[-ssl]
+	addns? ( net-dns/bind-tools[gssapi] )
 	client? ( net-fs/cifs-utils[ads?] )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	ldap? ( net-nds/openldap )
@@ -60,9 +61,7 @@
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
+	python_export_best
 	if use aio; then
 		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
 				ewarn "You must enable AIO support in your kernel config, "
@@ -117,6 +116,14 @@
 src_install() {
 	waf-utils_src_install
 
+	python_replicate_script \
+		"${D}/usr/sbin/samba_upgradeprovision" \
+		"${D}/usr/sbin/samba_dnsupdate" \
+		"${D}/usr/sbin/samba_spnupdate" \
+		"${D}/usr/sbin/samba_upgradedns" \
+		"${D}/usr/sbin/samba_kcc" \
+		"${D}/usr/bin/samba-tool"
+
 	# Make all .so files executable
 	find "${D}" -type f -name "*.so" -exec chmod +x {} +
 
@@ -134,9 +141,6 @@
 }
 
 pkg_postinst() {
-	# Optimize the python modules so they get properly removed
-	python_mod_optimize "${PN}"
-
 	elog "This is is the first stable release of Samba 4.0"
 
 	ewarn "Be aware the this release contains the best of all of Samba's"
@@ -149,8 +153,3 @@
 	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
 	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
 }
-
-pkg_postrm() {
-	# Clean up the python modules
-	python_mod_cleanup "${PN}"
-}