From 29401d9993a134fc27e6412e837869b559c186f8 Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Thu, 22 Oct 2009 18:09:59 +0000
Subject: Fixing tdb and talloc useflags for #288543, remove old
 Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

---
 net-fs/samba-libs/ChangeLog                  |   8 +-
 net-fs/samba-libs/Manifest                   |   6 +-
 net-fs/samba-libs/metadata.xml               |   2 -
 net-fs/samba-libs/samba-libs-3.4.2-r1.ebuild | 340 ---------------------------
 net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild | 304 ++++++++++++++++++++++++
 5 files changed, 314 insertions(+), 346 deletions(-)
 delete mode 100644 net-fs/samba-libs/samba-libs-3.4.2-r1.ebuild
 create mode 100644 net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild

(limited to 'net-fs')

diff --git a/net-fs/samba-libs/ChangeLog b/net-fs/samba-libs/ChangeLog
index ddca1ba0a13f..6a76cf71e53e 100644
--- a/net-fs/samba-libs/ChangeLog
+++ b/net-fs/samba-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba-libs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.14 2009/10/11 17:27:59 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.15 2009/10/22 18:09:59 patrick Exp $
+
+*samba-libs-3.4.2-r2 (22 Oct 2009)
+
+  22 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  -samba-libs-3.4.2-r1.ebuild, +samba-libs-3.4.2-r2.ebuild, metadata.xml:
+  Fixing tdb and talloc useflags for #288543, remove old
 
 *samba-libs-3.4.2-r1 (11 Oct 2009)
 
diff --git a/net-fs/samba-libs/Manifest b/net-fs/samba-libs/Manifest
index e4a0d604f8bb..d3dbe45d68de 100644
--- a/net-fs/samba-libs/Manifest
+++ b/net-fs/samba-libs/Manifest
@@ -15,6 +15,6 @@ AUX samba-3.4.2-upgrade-tevent-version.patch 288 RMD160 3eb9bbd781d4a92e844ff368
 DIST samba-3.3.8.tar.gz 26100617 RMD160 cef20f2be0b93575b090735570b3dd35e9c3c085 SHA1 8ec485e12227e3d1a1fa63e61605c5e2adb3c43e SHA256 3bd0bd525bdeebe5c3d795ab6c6c335d0e5d131c6ea0b01a392c26a9103292d2
 DIST samba-3.4.2.tar.gz 34979734 RMD160 741456633afeacccb1942089b9d759ac073d2562 SHA1 4077302ed27b6d9f50bbcfba58ca6a58fe9d0f59 SHA256 8b880e78d175a82df627d61a070461812bba209b21346aa0383cd5c96d364fc4
 EBUILD samba-libs-3.3.8.ebuild 4928 RMD160 68d595412a9ab280a5d430124fa9ef91b0be59d4 SHA1 c7fe9b50460dbcad184009146fbd2016999496d4 SHA256 78d25ae420664b194528227888d67dfac3f100e1781fa01d7a1c8741f9ed8140
-EBUILD samba-libs-3.4.2-r1.ebuild 9952 RMD160 9f240481cd25a2b48758e300b1caddee165d3e5e SHA1 d87538268c3067713dc7cb709558c72f38779708 SHA256 077d3bf5c81c6bc9c866f441ac32cb2e531d12646f0c5c6f917681e4e42c930f
-MISC ChangeLog 2801 RMD160 b1e73274739b80b40c8c3344d6faf668f0c49d76 SHA1 70e61cbadc379c4fc8cb2b049479c4414926897a SHA256 3dfdf2b51919edf21135eee58f7d7e7963e7dde93e658c55eeeab82a4182f97c
-MISC metadata.xml 1200 RMD160 439dba15343b4af422befd72851cae490dd08c0d SHA1 34e73c6750626193e9ed1a456985dde7380348e0 SHA256 fe768fb8c50b91d029bce1c486a1cf447b92be2a22e3376f5951b48647e34554
+EBUILD samba-libs-3.4.2-r2.ebuild 8621 RMD160 6266f3dd69ea8aed2c3c0b5ee4dd06158dc7a80a SHA1 c26dc5cf30d902a1e48d51501cb35ecb0c224afa SHA256 ddcfc0880a3c0db4f4629a079936effd6bfe1e4332c5716f0ce53cd2f01f6b47
+MISC ChangeLog 3021 RMD160 ec4656b43f53684f475064f67b58fcfef229a96d SHA1 d99193ce1f95c645e45d08e00e9bc4b97fd5ab38 SHA256 497a8d0e4a5e1006265ab054046763f322a745d4ec31398d79048f70856ae5fd
+MISC metadata.xml 1090 RMD160 af84a79c77541a08ede102de013f0da2b8417506 SHA1 d0b59c8af572f855d8320490261f0607bf80b6a8 SHA256 4105639021ac7ffde2bb656b35198db66708cb6a805706db549be153c9f9a141
diff --git a/net-fs/samba-libs/metadata.xml b/net-fs/samba-libs/metadata.xml
index a56428f9d2e5..68bee2e57d04 100644
--- a/net-fs/samba-libs/metadata.xml
+++ b/net-fs/samba-libs/metadata.xml
@@ -15,8 +15,6 @@ Samba is an Open Source/Free Software suite that provides seamless file and prin
 	<flag name="cluster">Enable support for clustering</flag>
 	<flag name="winbind">Enables support for the winbind auth daemon</flag>
 	<flag name="samba4">Enable experimental samba4 bits</flag>
-	<flag name="tdb">Enable building of tdb lib</flag>
-	<flag name="talloc">Enable building of talloc lib</flag>
 	<flag name="netapi">Enable building of netapi bits</flag>
 	<flag name="smbclient">Enable smbclient tool</flag>
 	<flag name="smbsharemodes">Enable special smb share modes (?) </flag>
diff --git a/net-fs/samba-libs/samba-libs-3.4.2-r1.ebuild b/net-fs/samba-libs/samba-libs-3.4.2-r1.ebuild
deleted file mode 100644
index 7ce335328283..000000000000
--- a/net-fs/samba-libs/samba-libs-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.2-r1.ebuild,v 1.1 2009/10/11 17:27:59 lxnay Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind
-	+tdb +talloc +netapi +smbclient smbsharemodes addns tools"
-
-DEPEND="dev-libs/popt
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs )
-	caps? ( sys-libs/libcap )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	addns? ( !talloc? ( virtual/talloc ) )
-	netapi? ( !tdb? ( virtual/tdb ) )
-	netapi? ( !talloc? ( virtual/talloc ) )
-	smbclient? ( !tdb? ( virtual/tdb ) )
-	smbclient? ( !talloc? ( virtual/talloc ) )
-	smbsharemodes? ( !tdb? ( virtual/tdb ) )
-	smbsharemodes? ( !talloc? ( virtual/talloc ) )
-	winbind? ( !tdb? ( virtual/tdb ) )
-	winbind? ( !talloc? ( virtual/talloc ) )
-	pam? ( !tdb? ( virtual/tdb ) )
-	pam? ( !talloc? ( virtual/talloc ) )
-	samba4? ( tools? ( !tdb? ( virtual/tdb ) ) )
-	samba4? ( tools? ( !talloc? ( virtual/talloc ) ) )
-	syslog? ( virtual/logger )
-	!<net-fs/samba-3.3"
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-BINPROGS=""
-
-if use tools ; then
-	if use tdb ; then BINPROGS="${BINPROGS} bin/tdbbackup bin/tdbdump bin/tdbtool"; fi
-	if use samba4 ; then BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; fi
-fi
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-
-	if use tdb && has_version sys-libs/tdb ; then
-		die "sys-libs/tdb already installed, please disable tdb use flag"
-	fi
-	if use talloc && has_version sys-libs/talloc ; then
-		die "sys-libs/talloc already installed, please disable talloc use flag"
-	fi
-
-}
-
-src_prepare() {
-
-	cd ".."
-
-	epatch \
-		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
-		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
-		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
-		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch"
-#		"${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-
-#	sed -i \
-#		-e 's|@LIBTALLOC_SHARED@||g' \
-#		-e 's|@LIBTDB_SHARED@||g' \
-#		-e 's|@LIBWBCLIENT_SHARED@||g' \
-#		-e 's|@LIBNETAPI_SHARED@||g' \
-#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-#		Makefile.in || die "sed failed"
-
-	./autogen.sh || die "autogen.sh failed"
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-
-#	sed -i \
-#		-e 's|"lib32" ||' \
-#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-#		configure || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-#	sed -i \
-#		-e '/^LINK_LIBNETAPI/d' \
-#		configure || die "sed failed"
-
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# Notes:
-	# - FAM is a plugin for the server
-	# - DNS-SD is only used in client/server code
-	# - AFS is a pw-auth-method and only used in client/server code
-	# - AFSACL is a server module
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore
-	# - quota-support is only needed in server-code
-	# - acl-support is only used in server-code
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		--disable-swat \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		--disable-fam \
-		--enable-shared-libs \
-		--disable-dnssd \
-		--disable-avahi \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		--without-quotas \
-		--without-sys-quotas \
-		--without-utmp \
-		$(use_with tdb libtdb) \
-		$(use_with netapi libnetapi) \
-		$(use_with talloc libtalloc) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		--without-acl-support \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-
-	# compile libs
-	if use tdb ; then
-		einfo "make tdb library"
-		emake libtdb || die "emake libtdb failed"
-	fi
-	if use talloc ; then
-		einfo "make talloc library"
-		emake libtalloc || die "emake libtalloc failed"
-	fi
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
-	fi
-
-	# compile modules
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
-	fi
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-
-	# compile utilities
-	if use tools ; then
-		einfo "make utilities"
-		emake ${BINPROGS} || die "emake binprogs failed";
-	fi
-
-}
-
-src_install() {
-
-	# install libs
-	if use tdb ; then
-		einfo "install tdb library"
-		emake installlibtdb DESTDIR="${D}" || die "emake install libtdb failed"
-	fi
-	if use talloc ; then
-		einfo "install talloc library"
-		emake installlibtalloc DESTDIR="${D}" || die "emake install libtalloc failed"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
-	fi
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
-	fi
-
-	# install modules
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
-	fi
-
-	# Remove empty installation directories
-	rmdir \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install lbwbclient"
-		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam ; then
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-			dohtml ../docs/htmldocs/manpages/pam_winbind.8.html
-
-			if use examples ; then
-				insinto /usr/share/doc/${PF}/examples
-				doins -r ../examples/pam_winbind
-			fi
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# install utilities
-	if use tools ; then
-		einfo "install utilities"
-		dobin ${BINPROGS} || die "not all bins around"
-		for prog in ${BINPROGS} ; do
-			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-			dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
-		done
-	fi
-
-	# install examples
-	if use examples ; then
-		einfo "install examples"
-		insinto /usr/share/doc/${PF}/examples
-		doins -r ../examples/libsmbclient
-		use winbind && doins -r ../examples/nss
-	fi
-
-}
diff --git a/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild b/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild
new file mode 100644
index 000000000000..224e87467d59
--- /dev/null
+++ b/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild,v 1.1 2009/10/22 18:09:59 patrick Exp $
+
+EAPI="2"
+
+inherit pam confutils versionator multilib
+
+MY_P="samba-${PV}"
+
+DESCRIPTION="Library bits of the samba network filesystem"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind
+	+netapi +smbclient smbsharemodes addns tools"
+
+DEPEND="dev-libs/popt
+	sys-libs/talloc
+	sys-libs/tdb
+	virtual/libiconv
+	ads? ( virtual/krb5 sys-fs/e2fsprogs )
+	caps? ( sys-libs/libcap )
+	cluster? ( dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-libs/dmalloc )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam
+		winbind? ( dev-libs/iniparser ) )
+	syslog? ( virtual/logger )
+	!<net-fs/samba-3.3"
+RDEPEND="${DEPEND}"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+BINPROGS=""
+
+if use tools ; then
+	if use samba4 ; then BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; fi
+fi
+
+S="${WORKDIR}/${MY_P}/source3"
+
+# TODO:
+# - enable iPrint on Prefix/OSX and Darwin?
+# - selftest-prefix? selftest?
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+pkg_setup() {
+	confutils_use_depend_all samba4 ads
+	confutils_use_depend_all ads ldap
+}
+
+src_prepare() {
+
+	cd ".."
+
+	epatch \
+		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
+		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
+		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
+		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch"
+#		"${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \
+
+	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
+
+	cd "source3"
+
+#	sed -i \
+#		-e 's|@LIBTALLOC_SHARED@||g' \
+#		-e 's|@LIBTDB_SHARED@||g' \
+#		-e 's|@LIBWBCLIENT_SHARED@||g' \
+#		-e 's|@LIBNETAPI_SHARED@||g' \
+#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
+#		Makefile.in || die "sed failed"
+
+	./autogen.sh || die "autogen.sh failed"
+
+	# ensure that winbind has correct ldflags (QA notice)
+	sed -i \
+		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
+		configure || die "sed failed"
+
+#	sed -i \
+#		-e 's|"lib32" ||' \
+#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
+#		configure || die "sed failed"
+
+	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
+#	sed -i \
+#		-e '/^LINK_LIBNETAPI/d' \
+#		configure || die "sed failed"
+
+}
+
+src_configure() {
+	local myconf
+
+	# compile franky samba4 hybrid
+	# http://wiki.samba.org/index.php/Franky
+	if use samba4 ; then
+		myconf="${myconf} --enable-merged-build --enable-developer"
+		if has_version app-crypt/heimdal ; then
+			myconf="${myconf} --with-krb5=/usr/"
+		elif has_version app-crypt/mit-krb5 ; then
+			die "MIT Kerberos not supported by samba 4, use heimdal"
+		else
+			die "No supported kerberos provider detected"
+		fi
+	fi
+
+	# Filter out -fPIE
+	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
+	use hppa && myconf="${myconf} --disable-pie"
+
+	# Upstream refuses to make this configurable
+	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
+
+	# Notes:
+	# - FAM is a plugin for the server
+	# - DNS-SD is only used in client/server code
+	# - AFS is a pw-auth-method and only used in client/server code
+	# - AFSACL is a server module
+	# - automount is only needed in conjunction with NIS and we don't have that
+	# anymore
+	# - quota-support is only needed in server-code
+	# - acl-support is only used in server-code
+	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
+	econf ${myconf} \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		$(use_enable debug developer) \
+		--enable-largefile \
+		--enable-socket-wrapper \
+		--enable-nss-wrapper \
+		--disable-swat \
+		$(use_enable debug dmalloc) \
+		$(use_enable cups) \
+		--disable-iprint \
+		--disable-fam \
+		--enable-shared-libs \
+		--disable-dnssd \
+		--disable-avahi \
+		--with-fhs \
+		--with-privatedir=/var/lib/samba/private \
+		--with-rootsbindir=/var/cache/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--with-configdir=/etc/samba \
+		--with-logfilebase=/var/log/samba \
+		--with-pammodulesdir=$(getpam_mod_dir) \
+		--without-afs \
+		--without-fake-kaserver \
+		--without-vfs-afsacl \
+		$(use_with ldap) \
+		$(use_with ads) \
+		$(use_with ads krb5 /usr) \
+		$(use_with ads dnsupdate) \
+		--without-automount \
+		--without-cifsmount \
+		--without-cifsupcall \
+		$(use_with pam) \
+		$(use_with pam pam_smbpass) \
+		$(use_with syslog) \
+		--without-quotas \
+		--without-sys-quotas \
+		--without-utmp \
+		--without-libtdb \
+		$(use_with netapi libnetapi) \
+		--without-libtalloc \
+		$(use_with smbclient libsmbclient) \
+		$(use_with smbsharemodes libsmbsharemodes) \
+		$(use_with addns libaddns) \
+		$(use_with cluster ctdb /usr) \
+		$(use_with cluster cluster-support) \
+		--without-acl-support \
+		$(use_with aio aio-support) \
+		--with-sendfile-support \
+		$(use_with winbind) \
+		--without-included-popt \
+		--without-included-iniparser
+}
+
+src_compile() {
+
+	# compile libs
+	if use addns ; then
+		einfo "make addns library"
+		emake libaddns || die "emake libaddns failed"
+	fi
+	if use netapi ; then
+		einfo "make netapi library"
+		emake libnetapi || die "emake libnetapi failed"
+	fi
+	if use smbclient ; then
+		einfo "make smbclient library"
+		emake libsmbclient || die "emake libsmbclient failed"
+	fi
+	if use smbsharemodes ; then
+		einfo "make smbsharemodes library"
+		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
+	fi
+
+	# compile modules
+	if use pam ; then
+		einfo "make pam modules"
+		emake pam_modules || die "emake pam_modules failed";
+	fi
+	if use winbind ; then
+		einfo "make nss modules"
+		emake nss_modules || die "emake nss_modules failed";
+	fi
+
+	# compile utilities
+	if use tools ; then
+		einfo "make utilities"
+		emake ${BINPROGS} || die "emake binprogs failed";
+	fi
+
+}
+
+src_install() {
+
+	# install libs
+	if use netapi ; then
+		einfo "install netapi library"
+		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
+	fi
+	if use addns ; then
+		einfo "install addns library"
+		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
+	fi
+
+	# install modules
+	if use pam ; then
+		einfo "install pam modules"
+		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
+	fi
+
+	# Remove empty installation directories
+	rmdir \
+		"${D}/usr/$(get_libdir)/samba" \
+		"${D}/usr"/{sbin,bin} \
+		"${D}/usr/share"/{man,locale,} \
+		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
+	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		einfo "install lbwbclient"
+		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
+		dolib.so ../nsswitch/libnss_wins.so
+		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
+		dolib.so ../nsswitch/libnss_winbind.so
+		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+	fi
+
+	if use pam ; then
+		if use winbind ; then
+			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+			doman ../docs/manpages/pam_winbind.8
+			dohtml ../docs/htmldocs/manpages/pam_winbind.8.html
+
+			if use examples ; then
+				insinto /usr/share/doc/${PF}/examples
+				doins -r ../examples/pam_winbind
+			fi
+		fi
+
+		newpamd "${CONFDIR}/samba.pam" samba
+		dodoc pam_smbpass/README
+	fi
+
+	# install utilities
+	if use tools ; then
+		einfo "install utilities"
+		dobin ${BINPROGS} || die "not all bins around"
+		for prog in ${BINPROGS} ; do
+			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+			dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
+		done
+	fi
+
+	# install examples
+	if use examples ; then
+		einfo "install examples"
+		insinto /usr/share/doc/${PF}/examples
+		doins -r ../examples/libsmbclient
+		use winbind && doins -r ../examples/nss
+	fi
+
+}
-- 
cgit v1.2.3-65-gdbad