Fixing tdb and talloc useflags for #288543, remove old

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 16 insertions, 48 deletions

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-r2.ebuild
index 7ce335328283..224e87467d59 100644
--- a/net-fs/samba-libs/samba-libs-3.4.2-r1.ebuild
+++ b/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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"
 
@@ -15,9 +15,11 @@ 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"
+	+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 )
@@ -27,19 +29,6 @@ DEPEND="dev-libs/popt
 	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}"
@@ -50,7 +39,6 @@ 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
 
@@ -65,14 +53,6 @@ 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() {
@@ -189,9 +169,9 @@ src_configure() {
 		--without-quotas \
 		--without-sys-quotas \
 		--without-utmp \
-		$(use_with tdb libtdb) \
+		--without-libtdb \
 		$(use_with netapi libnetapi) \
-		$(use_with talloc libtalloc) \
+		--without-libtalloc \
 		$(use_with smbclient libsmbclient) \
 		$(use_with smbsharemodes libsmbsharemodes) \
 		$(use_with addns libaddns) \
@@ -208,14 +188,6 @@ src_configure() {
 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"
@@ -254,14 +226,6 @@ src_compile() {
 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"