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

(Portage version: 2.1_rc3-r2)

7 files changed, 25 insertions, 39 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/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}"