deprecated 'xml2' use flag removed (use 'xml' instead)

Package-Manager: portage-2.1_rc3-r2

8 files changed, 66 insertions, 80 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index b77c3bb1bacd..0f3028e06f53 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.240 2006/05/15 09:07:44 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.241 2006/06/08 10:51:02 satya Exp $
+
+  08 Jun 2006; Christian Andreetta <satya@gentoo.org>
+  samba-3.0.14a-r2.ebuild, samba-3.0.20b.ebuild, samba-3.0.21a.ebuild,
+  samba-3.0.21b-r1.ebuild, samba-3.0.22.ebuild, samba-3.0.22-r2.ebuild:
+  deprecated 'xml2' use flag removed (use 'xml' instead)
 
   15 May 2006; Christian Andreetta <satya@gentoo.org>
   -samba-3.0.14a-r3.ebuild, -samba-3.0.21c-r1.ebuild,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 411d28900154..8b1b49ef26d8 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,50 +1,50 @@
-AUX 035_all_samba-3.0.21-winbind_log.patch 438 RMD160 11b402af2f251c91de0ca1fd2ef0d011f28f1450 SHA1 ee449f51222d70ee4e8e2c1f84f0b2fb3500a92f SHA256 cf22a104c251470be1347079951d2eef847e1e3e8a9604e491985b9aadd8e0d0 size 438
+AUX 035_all_samba-3.0.21-winbind_log.patch 438 RMD160 11b402af2f251c91de0ca1fd2ef0d011f28f1450 SHA1 ee449f51222d70ee4e8e2c1f84f0b2fb3500a92f SHA256 cf22a104c251470be1347079951d2eef847e1e3e8a9604e491985b9aadd8e0d0
 MD5 7cbe28bc9f7e821c88c4f80c39752eb5 files/035_all_samba-3.0.21-winbind_log.patch 438
 RMD160 11b402af2f251c91de0ca1fd2ef0d011f28f1450 files/035_all_samba-3.0.21-winbind_log.patch 438
 SHA256 cf22a104c251470be1347079951d2eef847e1e3e8a9604e491985b9aadd8e0d0 files/035_all_samba-3.0.21-winbind_log.patch 438
-AUX README.gentoo 2682 RMD160 8463761043508f9fbaf8e2dcde71315f37e85d1b SHA1 14dbc55d2023eeedb927704a959358f11295a510 SHA256 e01f08d8cc91506b1d212b9b59648b96458fe79c6bff483a5b49aef90c3ac3bb size 2682
+AUX README.gentoo 2682 RMD160 8463761043508f9fbaf8e2dcde71315f37e85d1b SHA1 14dbc55d2023eeedb927704a959358f11295a510 SHA256 e01f08d8cc91506b1d212b9b59648b96458fe79c6bff483a5b49aef90c3ac3bb
 MD5 4909031b1d1c775a746e4804997c65ce files/README.gentoo 2682
 RMD160 8463761043508f9fbaf8e2dcde71315f37e85d1b files/README.gentoo 2682
 SHA256 e01f08d8cc91506b1d212b9b59648b96458fe79c6bff483a5b49aef90c3ac3bb files/README.gentoo 2682
-DIST samba-3-gentoo-0.3.10.tar.bz2 16783 RMD160 9f73b1f955ca3b5b9dbedfe9854fd788eca62050 SHA256 69748dbe3566eaa0ea27fd0e0dcef20309089cbe40de2e1bce450f3d9dc4e8c2 size 16783
-DIST samba-3-gentoo-0.3.11.tar.bz2 15929 RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da size 15929
-DIST samba-3-gentoo-0.3.3.tar.bz2 17675 RMD160 d9193e67c6ee0861de3f7ba16de42cb38922913c SHA256 1e376c070ba597ad8822741b3b55f810a2613dede9cad1ef3b0f28cc3abb1fdf size 17675
-DIST samba-3.0.14a.tar.gz 15605851 RMD160 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f SHA256 d8721cc71b9c4ac878d3eef02f01bde7aee18bddd4e40bf213fca577edf3fd18 size 15605851
-DIST samba-3.0.20b.tar.gz 17165513 RMD160 c7fe6cf7e3cae6835efd631f9c7d8b97c8253370 SHA256 61d165b7df5cfae1968833caf76d53a9ebfd3849a40098ed26caafcda0a073f6 size 17165513
-DIST samba-3.0.21a.tar.gz 17524018 RMD160 0daede1526cacd631654a82b33af48ffb4789ce4 SHA256 8f4902db38b20601cc3315fe9516a9380b067678c5a6828bd67e5a8bc46b097c size 17524018
-DIST samba-3.0.21b.tar.gz 17539079 RMD160 883f855523e2a079cd7295df6647b3cb9b56c23a SHA256 a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0 size 17539079
-DIST samba-3.0.22.tar.gz 17542657 RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d size 17542657
-DIST samba-vscan-0.3.6.tar.bz2 166733 RMD160 462a9de0789122c0627b0ed4f6e7b6ed3cd883af SHA256 5e552668d8e31d78281a4e93c4ac9b3490e145bc27d4ad0029d175f6c90a755a size 166733
-DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 size 164471
-EBUILD samba-3.0.14a-r2.ebuild 9269 RMD160 c2ffb9a911f45c1f83313c9972938b6028f374a7 SHA1 33c77d5c902e988d3637255cc501f420dc4e7189 SHA256 5c1b64cee4479cba6f07981995bf562c49ed45d8d8de6fcc76d0ed65227906cd size 9269
-MD5 61f0df98191ae242f294459ac9eee7e7 samba-3.0.14a-r2.ebuild 9269
-RMD160 c2ffb9a911f45c1f83313c9972938b6028f374a7 samba-3.0.14a-r2.ebuild 9269
-SHA256 5c1b64cee4479cba6f07981995bf562c49ed45d8d8de6fcc76d0ed65227906cd samba-3.0.14a-r2.ebuild 9269
-EBUILD samba-3.0.20b.ebuild 8625 RMD160 67ac257cf61ffcaf2fab2a3dbcff0a35840bc673 SHA1 c54646a4196d4b6b26ce2f97ed347baf6da28682 SHA256 7c816bdf1e9d104d9402add068b96930ce06d869bcce69df8cdcd6725db908f2 size 8625
-MD5 56eb4dab3e8e14f80e89d6b85f7dd902 samba-3.0.20b.ebuild 8625
-RMD160 67ac257cf61ffcaf2fab2a3dbcff0a35840bc673 samba-3.0.20b.ebuild 8625
-SHA256 7c816bdf1e9d104d9402add068b96930ce06d869bcce69df8cdcd6725db908f2 samba-3.0.20b.ebuild 8625
-EBUILD samba-3.0.21a.ebuild 8614 RMD160 8ab10e38ca352508befe26e9ceba22fa28580942 SHA1 13b05c92fa737b5fe78adac1807151e425a4f324 SHA256 8c18e7127bcb06a0d4867a001dbcf71478154d747862cc7a32ef3f9c8ffc2818 size 8614
-MD5 c5a70bc09be5f115ebfbc5fb000be560 samba-3.0.21a.ebuild 8614
-RMD160 8ab10e38ca352508befe26e9ceba22fa28580942 samba-3.0.21a.ebuild 8614
-SHA256 8c18e7127bcb06a0d4867a001dbcf71478154d747862cc7a32ef3f9c8ffc2818 samba-3.0.21a.ebuild 8614
-EBUILD samba-3.0.21b-r1.ebuild 8717 RMD160 d3626b923e3e16cc8581e5d65db6fb52c13036a7 SHA1 e551a1c61eeaba824fe09b86ddb9244786cda63c SHA256 d32bcb2a1a3c0b44c516b642ec80eade95dffc538cf18dfcd36db2a3ed1329dc size 8717
-MD5 3f52053c36d38ea2153225d8c6f3f736 samba-3.0.21b-r1.ebuild 8717
-RMD160 d3626b923e3e16cc8581e5d65db6fb52c13036a7 samba-3.0.21b-r1.ebuild 8717
-SHA256 d32bcb2a1a3c0b44c516b642ec80eade95dffc538cf18dfcd36db2a3ed1329dc samba-3.0.21b-r1.ebuild 8717
-EBUILD samba-3.0.22-r2.ebuild 8761 RMD160 2a4bc86b3d879bb342f338530c29011f4a33a1f2 SHA1 0b2485336ace89a508ae17c28f087ec92ced02bd SHA256 8d256f095ee75369e64932e38fdcd0a4e209e955e8ddd31bd1139a51a92d30c5 size 8761
-MD5 6bc60b39072774c77513eb77bfa59380 samba-3.0.22-r2.ebuild 8761
-RMD160 2a4bc86b3d879bb342f338530c29011f4a33a1f2 samba-3.0.22-r2.ebuild 8761
-SHA256 8d256f095ee75369e64932e38fdcd0a4e209e955e8ddd31bd1139a51a92d30c5 samba-3.0.22-r2.ebuild 8761
-EBUILD samba-3.0.22.ebuild 8724 RMD160 7776c1bb38ee3447d627aaf286c41ed71f2a2b96 SHA1 cc7cd0ee6025857979f76eeda19640b7a3d8c1ae SHA256 99b421e9eace4a7c3fcc80c2f2e32a59569920d8dc7f1fdd8197d0643e2b778f size 8724
-MD5 35d2ea945dc397a1d54c65a7e308a93b samba-3.0.22.ebuild 8724
-RMD160 7776c1bb38ee3447d627aaf286c41ed71f2a2b96 samba-3.0.22.ebuild 8724
-SHA256 99b421e9eace4a7c3fcc80c2f2e32a59569920d8dc7f1fdd8197d0643e2b778f samba-3.0.22.ebuild 8724
-MISC ChangeLog 41817 RMD160 244aa084454e7ed4a0a979075b9c607871cb3511 SHA1 682aef800f89cb847512c54f2bbfd7546bcf9a82 SHA256 5c353c320f9c6f209aa375a03d0c6a465580cac6cd109a3d119da910f1439bc2 size 41817
-MD5 e603b41998c9afb469a0e0e9e16d667e ChangeLog 41817
-RMD160 244aa084454e7ed4a0a979075b9c607871cb3511 ChangeLog 41817
-SHA256 5c353c320f9c6f209aa375a03d0c6a465580cac6cd109a3d119da910f1439bc2 ChangeLog 41817
-MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 size 491
+DIST samba-3-gentoo-0.3.10.tar.bz2 16783 RMD160 9f73b1f955ca3b5b9dbedfe9854fd788eca62050 SHA256 69748dbe3566eaa0ea27fd0e0dcef20309089cbe40de2e1bce450f3d9dc4e8c2
+DIST samba-3-gentoo-0.3.11.tar.bz2 15929 RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 SHA1 a6107e8d8fed056255cff31b0b52da7e32fe7289 SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da
+DIST samba-3-gentoo-0.3.3.tar.bz2 17675 RMD160 d9193e67c6ee0861de3f7ba16de42cb38922913c SHA256 1e376c070ba597ad8822741b3b55f810a2613dede9cad1ef3b0f28cc3abb1fdf
+DIST samba-3.0.14a.tar.gz 15605851 RMD160 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f SHA256 d8721cc71b9c4ac878d3eef02f01bde7aee18bddd4e40bf213fca577edf3fd18
+DIST samba-3.0.20b.tar.gz 17165513 RMD160 c7fe6cf7e3cae6835efd631f9c7d8b97c8253370 SHA256 61d165b7df5cfae1968833caf76d53a9ebfd3849a40098ed26caafcda0a073f6
+DIST samba-3.0.21a.tar.gz 17524018 RMD160 0daede1526cacd631654a82b33af48ffb4789ce4 SHA256 8f4902db38b20601cc3315fe9516a9380b067678c5a6828bd67e5a8bc46b097c
+DIST samba-3.0.21b.tar.gz 17539079 RMD160 883f855523e2a079cd7295df6647b3cb9b56c23a SHA256 a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0
+DIST samba-3.0.22.tar.gz 17542657 RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 SHA1 76eba872b3e8f647e16d0d8d129e02848a7989d7 SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d
+DIST samba-vscan-0.3.6.tar.bz2 166733 RMD160 462a9de0789122c0627b0ed4f6e7b6ed3cd883af SHA256 5e552668d8e31d78281a4e93c4ac9b3490e145bc27d4ad0029d175f6c90a755a
+DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA1 b11e8303380ee8d271a916a17a16cbab9d0d36f8 SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4
+EBUILD samba-3.0.14a-r2.ebuild 9191 RMD160 d217d211044720ec3efa448734d0f6203f759d1d SHA1 7b5d748c1a821adb0f22b5a3831273cbb5fb9474 SHA256 e3700d97828ed3863d5460cc6e80548e4105c53e800ceb18a173f01765483207
+MD5 0746e34640f9664a8a9505266e13a733 samba-3.0.14a-r2.ebuild 9191
+RMD160 d217d211044720ec3efa448734d0f6203f759d1d samba-3.0.14a-r2.ebuild 9191
+SHA256 e3700d97828ed3863d5460cc6e80548e4105c53e800ceb18a173f01765483207 samba-3.0.14a-r2.ebuild 9191
+EBUILD samba-3.0.20b.ebuild 8547 RMD160 edb32be585660ccafff9f7c910c9fac38ecaf42b SHA1 59ca3e8d13e92f6ae766b7ec9b3cdaac38e516b5 SHA256 21897dada76df16361b2b2f224043b7988ee0422e0d2cb523ce4a6d73ad16d1d
+MD5 e7e619a56651490df3a41822c3bc2f6d samba-3.0.20b.ebuild 8547
+RMD160 edb32be585660ccafff9f7c910c9fac38ecaf42b samba-3.0.20b.ebuild 8547
+SHA256 21897dada76df16361b2b2f224043b7988ee0422e0d2cb523ce4a6d73ad16d1d samba-3.0.20b.ebuild 8547
+EBUILD samba-3.0.21a.ebuild 8537 RMD160 000e0120578ad59f8435560631e6f571cdd0a15f SHA1 fd52b73ca53777860e095efc0c28e1e0edb55eed SHA256 25dae7b0260c1fdceebdcf79d288ada7a5b245555f1a51c9de814124e460b543
+MD5 b20a654cda96ff5fbe3c7cbaa88465a8 samba-3.0.21a.ebuild 8537
+RMD160 000e0120578ad59f8435560631e6f571cdd0a15f samba-3.0.21a.ebuild 8537
+SHA256 25dae7b0260c1fdceebdcf79d288ada7a5b245555f1a51c9de814124e460b543 samba-3.0.21a.ebuild 8537
+EBUILD samba-3.0.21b-r1.ebuild 8640 RMD160 c0db0143db8162df2a511d2ee6e3ad39117808fe SHA1 d1bbc774b2e0b6d1c99dcfaea82464c00f52ebb1 SHA256 f9686da8a0887751cd3f96a8432ae0e7c75b3c8bbe57514697826193fea1735d
+MD5 6aa5918f0f37509ad8ef161d63f24dee samba-3.0.21b-r1.ebuild 8640
+RMD160 c0db0143db8162df2a511d2ee6e3ad39117808fe samba-3.0.21b-r1.ebuild 8640
+SHA256 f9686da8a0887751cd3f96a8432ae0e7c75b3c8bbe57514697826193fea1735d samba-3.0.21b-r1.ebuild 8640
+EBUILD samba-3.0.22-r2.ebuild 8684 RMD160 657926e83a59d8ee5d4a934f786b88c72c164ede SHA1 a99700b05b3e2b41893148a196829fc721f8b890 SHA256 b9846ec60b340914b96c246354a17fb47287ee1d7297e23360b0110761c25bfc
+MD5 473800fbdfdd7e51729ad3b85da6be98 samba-3.0.22-r2.ebuild 8684
+RMD160 657926e83a59d8ee5d4a934f786b88c72c164ede samba-3.0.22-r2.ebuild 8684
+SHA256 b9846ec60b340914b96c246354a17fb47287ee1d7297e23360b0110761c25bfc samba-3.0.22-r2.ebuild 8684
+EBUILD samba-3.0.22.ebuild 8647 RMD160 cd59985f89750276ac7481c744eaaf626e907f37 SHA1 2b2294af5b57f4ca54ca5c0ca75933fc7f7de039 SHA256 2b9c4105245ecb7ada0c76cfbc76308c6484d1ffdab5a97f954ffbbb5c4ae440
+MD5 e2d29c27e1598a69f4864a8d5d80fd53 samba-3.0.22.ebuild 8647
+RMD160 cd59985f89750276ac7481c744eaaf626e907f37 samba-3.0.22.ebuild 8647
+SHA256 2b9c4105245ecb7ada0c76cfbc76308c6484d1ffdab5a97f954ffbbb5c4ae440 samba-3.0.22.ebuild 8647
+MISC ChangeLog 42072 RMD160 41cb8d85776e6f5a87e996c56aef46761cb09b92 SHA1 9258b8217463c80d654fceaeea729a20ac0f44df SHA256 bb81bb395031328e22bc0966e15bb1f5bc1dc1f30a2cb38e4881963b4b7c1ffe
+MD5 a1a26ec5014d5a54411d76f6b124fa10 ChangeLog 42072
+RMD160 41cb8d85776e6f5a87e996c56aef46761cb09b92 ChangeLog 42072
+SHA256 bb81bb395031328e22bc0966e15bb1f5bc1dc1f30a2cb38e4881963b4b7c1ffe ChangeLog 42072
+MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
 SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 metadata.xml 491
diff --git a/net-fs/samba/samba-3.0.14a-r2.ebuild b/net-fs/samba/samba-3.0.14a-r2.ebuild
index 8be4554628d7..cdd5bf993f47 100644
--- a/net-fs/samba/samba-3.0.14a-r2.ebuild
+++ b/net-fs/samba/samba-3.0.14a-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.20 2005/11/08 13:28:01 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.21 2006/06/08 10:51:02 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl cups doc examples kerberos ldap mysql pam postgres python quotas
-	readline winbind xml xml2 libclamav oav selinux"
+	readline winbind xml libclamav oav selinux"
 
 VSCAN_VER=0.3.6
 PATCH_VER=0.3.3
@@ -39,7 +39,6 @@ RDEPEND="dev-libs/popt
 	python?    ( dev-lang/python )
 	readline?  ( sys-libs/readline )
 	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
 	selinux? ( sec-policy/selinux-samba )"
 
 DEPEND="${RDEPEND}
@@ -72,10 +71,7 @@ src_compile() {
 	local mymods
 	local mylangs
 
-	if use xml || use xml2 ;
-	then
-		mymods="xml,${mymods}"
-	fi
+	use xml && mymods="xml,${mymods}"
 	use mysql && mymods="mysql,${mymods}"
 	use postgres && mymods="pgsql,${mymods}"
 	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
diff --git a/net-fs/samba/samba-3.0.20b.ebuild b/net-fs/samba/samba-3.0.20b.ebuild
index 6e7c61f120d0..10a01ced68d3 100644
--- a/net-fs/samba/samba-3.0.20b.ebuild
+++ b/net-fs/samba/samba-3.0.20b.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.20b.ebuild,v 1.6 2006/01/29 05:19:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.20b.ebuild,v 1.7 2006/06/08 10:51:02 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav mysql
-	oav pam postgres python quotas readline selinux swat syslog winbind xml xml2"
+	oav pam postgres python quotas readline selinux swat syslog winbind xml"
 RESTRICT="test"
 
 VSCAN_VER=0.3.6
@@ -41,7 +41,6 @@ RDEPEND="dev-libs/popt
 	swat?      ( sys-apps/xinetd )
 	syslog?    ( virtual/logger )
 	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
 	"
 
 DEPEND="${RDEPEND}
@@ -86,9 +85,7 @@ src_compile() {
 	local mymods
 	local mylangs
 
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
+	use xml && mymods="xml,${mymods}"
 	use mysql && mymods="mysql,${mymods}"
 	use postgres && mymods="pgsql,${mymods}"
 	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
diff --git a/net-fs/samba/samba-3.0.21a.ebuild b/net-fs/samba/samba-3.0.21a.ebuild
index c950526b0d41..a441b8540182 100644
--- a/net-fs/samba/samba-3.0.21a.ebuild
+++ b/net-fs/samba/samba-3.0.21a.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.21a.ebuild,v 1.1 2006/02/02 10:47:03 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.21a.ebuild,v 1.2 2006/06/08 10:51:02 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav mysql
-	oav pam postgres python quotas readline selinux swat syslog winbind xml xml2"
+	oav pam postgres python quotas readline selinux swat syslog winbind xml"
 RESTRICT="test"
 
 VSCAN_VER="0.3.6b"
@@ -41,7 +41,6 @@ RDEPEND="dev-libs/popt
 	swat?      ( sys-apps/xinetd )
 	syslog?    ( virtual/logger )
 	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
 	"
 
 DEPEND="${RDEPEND}
@@ -78,9 +77,7 @@ src_compile() {
 	local mymods
 	local mylangs
 
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
+	use xml && mymods="xml,${mymods}"
 	use mysql && mymods="mysql,${mymods}"
 	use postgres && mymods="pgsql,${mymods}"
 	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
diff --git a/net-fs/samba/samba-3.0.21b-r1.ebuild b/net-fs/samba/samba-3.0.21b-r1.ebuild
index f7d3857ea80c..93897a982b34 100644
--- a/net-fs/samba/samba-3.0.21b-r1.ebuild
+++ b/net-fs/samba/samba-3.0.21b-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.21b-r1.ebuild,v 1.1 2006/03/31 08:17:42 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.21b-r1.ebuild,v 1.2 2006/06/08 10:51:02 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav mysql
-	oav pam postgres python quotas readline selinux swat syslog winbind xml xml2"
+	oav pam postgres python quotas readline selinux swat syslog winbind xml"
 RESTRICT="test"
 
 VSCAN_VER="0.3.6b"
@@ -41,7 +41,6 @@ RDEPEND="dev-libs/popt
 	swat?      ( sys-apps/xinetd )
 	syslog?    ( virtual/logger )
 	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
 	"
 
 DEPEND="${RDEPEND}
@@ -79,9 +78,7 @@ src_compile() {
 	local mymods
 	local mylangs
 
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
+	use xml && mymods="xml,${mymods}"
 	use mysql && mymods="mysql,${mymods}"
 	use postgres && mymods="pgsql,${mymods}"
 	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
diff --git a/net-fs/samba/samba-3.0.22-r2.ebuild b/net-fs/samba/samba-3.0.22-r2.ebuild
index 5be648ff96b1..fb6a3df0a4d6 100644
--- a/net-fs/samba/samba-3.0.22-r2.ebuild
+++ b/net-fs/samba/samba-3.0.22-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22-r2.ebuild,v 1.2 2006/05/15 09:03:12 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22-r2.ebuild,v 1.3 2006/06/08 10:51:02 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav
 	mysql oav pam postgres python quotas readline selinux swat syslog
-	winbind xml xml2"
+	winbind xml"
 RESTRICT="test"
 
 VSCAN_VER="0.3.6b"
@@ -43,7 +43,6 @@ RDEPEND="dev-libs/popt
 	swat?      ( sys-apps/xinetd )
 	syslog?    ( virtual/logger )
 	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
 	"
 
 DEPEND="${RDEPEND}
@@ -80,9 +79,7 @@ src_compile() {
 	local mymods
 	local mylangs
 
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
+	use xml && mymods="xml,${mymods}"
 	use mysql && mymods="mysql,${mymods}"
 	use postgres && mymods="pgsql,${mymods}"
 	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"
diff --git a/net-fs/samba/samba-3.0.22.ebuild b/net-fs/samba/samba-3.0.22.ebuild
index 6e9eca75d6d3..76581f7fcbaa 100644
--- a/net-fs/samba/samba-3.0.22.ebuild
+++ b/net-fs/samba/samba-3.0.22.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22.ebuild,v 1.13 2006/04/28 23:10:48 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22.ebuild,v 1.14 2006/06/08 10:51:02 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav mysql
-	oav pam postgres python quotas readline selinux swat syslog winbind xml xml2"
+	oav pam postgres python quotas readline selinux swat syslog winbind xml"
 RESTRICT="test"
 
 VSCAN_VER="0.3.6b"
@@ -42,7 +42,6 @@ RDEPEND="dev-libs/popt
 	swat?      ( sys-apps/xinetd )
 	syslog?    ( virtual/logger )
 	xml?       ( dev-libs/libxml2 sys-libs/zlib )
-	xml2?      ( dev-libs/libxml2 sys-libs/zlib )
 	"
 
 DEPEND="${RDEPEND}
@@ -79,9 +78,7 @@ src_compile() {
 	local mymods
 	local mylangs
 
-	if use xml || use xml2 ; then
-		mymods="xml,${mymods}"
-	fi
+	use xml && mymods="xml,${mymods}"
 	use mysql && mymods="mysql,${mymods}"
 	use postgres && mymods="pgsql,${mymods}"
 	[[ -n "${mymods}" ]] && myconf="--with-expsam=${mymods}"