Index: samba-4.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v
retrieving revision 1.1
diff -u -b -B -r1.1 samba-4.0.0.ebuild
--- samba-4.0.0.ebuild	12 Dec 2012 04:50:23 -0000	1.1
+++ samba-4.0.0.ebuild	13 Dec 2012 16:55:35 -0000
@@ -5,7 +5,7 @@
 EAPI=4
 PYTHON_DEPEND="2"
 
-inherit confutils python waf-utils multilib linux-info
+inherit python waf-utils multilib linux-info
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -59,8 +59,6 @@
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
-	confutils_use_depend_all fulltest test
-
 	python_set_active_version 2
 	python_pkg_setup
 
@@ -80,13 +78,9 @@
 
 src_configure() {
 	local myconf=''
-	if use "debug"; then
-		myconf="${myconf} --enable-developer"
-	fi
-	if use "cluster"; then
-		myconf="${myconf} --with-ctdb-dir=/usr"
-	fi
-	myconf="${myconf} \
+	use "debug" && myconf+=" --enable-developer"
+	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
+	myconf+="
 		--enable-fhs \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
@@ -113,7 +107,8 @@
 		$(use_with quota) \
 		$(use_with syslog) \
 		$(use_with swat) \
-		$(use_with winbind)"
+		$(use_with winbind)
+	"
 	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }
@@ -129,13 +124,13 @@
 	mv "${D}"/usr/$(get_libdir)/ldb/*.so "${D}"/usr/$(get_libdir)/ldb/modules/ldb
 
 	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba || die "newinitd failed"
-	newconfd "${CONFDIR}/samba4.confd" samba || die "newconfd failed"
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
 }
 
 src_test() {
 	local extra_opts=""
-	use fulltest || extra_opts+="--quick"
+	use fulltest || extra_opts+=" --quick"
 	"${WAF_BINARY}" test ${extra_opts} || die "test failed"
 }