Migrate xml2 useflag to be xml, per bug #116346

(Portage version: 2.1_pre7-r4)

7 files changed, 47 insertions, 52 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index d6e58e755cc8..1fad3cfb67fb 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.109 2006/03/27 03:40:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.110 2006/04/09 16:56:28 steev Exp $
+
+  09 Apr 2006; Steev Klimaszewski <steev@gentoo.org> dbus-0.23.4-r1.ebuild,
+  dbus-0.50-r1.ebuild, dbus-0.50-r2.ebuild, dbus-0.60-r3.ebuild,
+  dbus-0.60-r4.ebuild:
+  Migrate the xml2 useflag to be xml, per bug #79178
 
 *dbus-0.61-r1 (27 Mar 2006)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index e70589d2e2a9..8aef9586b9fb 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9586338dd0dc4e6cae474cf6f5b70f92 ChangeLog 15752
 RMD160 ef9df832f5fcab7353b06cb6f17a07837481b0c6 ChangeLog 15752
 SHA256 d51fe45fb81f2a70477d75e80b4ecc1736c63b847d43878004d708a15b00632d ChangeLog 15752
-MD5 80bd8d05a4478ae3d83d952d19e928ac dbus-0.23.4-r1.ebuild 3647
-RMD160 ca03ac02fddf891a097814dac744774d2aaa3267 dbus-0.23.4-r1.ebuild 3647
-SHA256 d08b90313aab10d5a71e7e0858e3548983cb2dfc4bd7317dfb99a57c2a0faad0 dbus-0.23.4-r1.ebuild 3647
-MD5 9cbbbd99c7ff7776f7b857effba153d2 dbus-0.50-r1.ebuild 3904
-RMD160 69a3ba30658fe9d29b0a229428d3735bd8da38bb dbus-0.50-r1.ebuild 3904
-SHA256 88f3b1c5ff29d8fc30da13c30b108a2ef4915523a43a49d6ea65b1b9cfe64763 dbus-0.50-r1.ebuild 3904
-MD5 a69505a0d7305bbb699ba1bc08419cb0 dbus-0.50-r2.ebuild 4340
-RMD160 be0fe501993355101e529051803a134308d31044 dbus-0.50-r2.ebuild 4340
-SHA256 6a22ddf11ed5ab068cff623f2add8fc2cb017d13626af9339cb448e88fdb6059 dbus-0.50-r2.ebuild 4340
-MD5 ae9dc121dca924b36a076a0528eb0cdb dbus-0.60-r3.ebuild 4414
-RMD160 95778ee6a2af75ccb2074e461bf8a3b888fd3e71 dbus-0.60-r3.ebuild 4414
-SHA256 7cb5970a6e0cd9f63b737fa544618e48a451d0664b4d1d6568e8a4f84f9e4925 dbus-0.60-r3.ebuild 4414
-MD5 c002c05d2aaf3510f3f13c68b500ea26 dbus-0.60-r4.ebuild 4625
-RMD160 3add3d3700d3f42b90d89053181451f38b80d1a1 dbus-0.60-r4.ebuild 4625
-SHA256 4b9ab333b66e1cfdcb15dc20f6df9e72528942d7b83c1551a40cf23003ac2d4e dbus-0.60-r4.ebuild 4625
+MD5 fcba9bb2711efdfea98750259538672d dbus-0.23.4-r1.ebuild 3642
+RMD160 4a8b1005fe243adf80f5d702228dd2ea7c351364 dbus-0.23.4-r1.ebuild 3642
+SHA256 d257cdc2f2ddef1d87821c52c5e99a05c17a731298ea0da8f6fd4f93b93a45a3 dbus-0.23.4-r1.ebuild 3642
+MD5 3151816cfddf2a55afb5391a90201dd4 dbus-0.50-r1.ebuild 3900
+RMD160 e0759880e9e9975e50d5fd70c3757206817a8b85 dbus-0.50-r1.ebuild 3900
+SHA256 c8027164341702c6a04764ae97f3aeb9f7647d2e015a721d62b4b14c1e8e4fe5 dbus-0.50-r1.ebuild 3900
+MD5 662cf27e70edaa97603f713fe1650894 dbus-0.50-r2.ebuild 4336
+RMD160 e511f024156d556358bfe8557e6ef70bc4f8c7e7 dbus-0.50-r2.ebuild 4336
+SHA256 8d3329a2f0e1de8ab2ff33918611c7be5c1aa6698cd49f1eeadde54a393f7024 dbus-0.50-r2.ebuild 4336
+MD5 1a6ffa05a2a6c566b4e4115a3bc7da66 dbus-0.60-r3.ebuild 4410
+RMD160 b09fbff6f88224ca77b3019098f27baf591915f6 dbus-0.60-r3.ebuild 4410
+SHA256 d3ca5d3c108f9885e853e4037a2a88f0b18f207b29a628213fd5fec4f6569a65 dbus-0.60-r3.ebuild 4410
+MD5 e724f2e7cbf87f9658dbe8425cffdcee dbus-0.60-r4.ebuild 4621
+RMD160 bec79d5e8bd98b9bed92e6b240170299999255c9 dbus-0.60-r4.ebuild 4621
+SHA256 8d3de354904b6c543a991ae91c254d27ed61195474d9bddbc09ee9d0e9d0e07c dbus-0.60-r4.ebuild 4621
 MD5 dd3a429554164f2dc3f505f019896426 dbus-0.61-r1.ebuild 4179
 RMD160 2200bf51a471f8e4df5ffb6a22595f1910e9c579 dbus-0.61-r1.ebuild 4179
 SHA256 52dca288779d1e9a1c21506416310dbe56243407235aaae6ca888394c125e370 dbus-0.61-r1.ebuild 4179
@@ -124,10 +121,3 @@ SHA256 8ee10bf68b294a8eef518926360a7b538fa9dda198e47b1d9f6367b6de0cdbcd files/di
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
 SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf metadata.xml 222
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEJ177BtvusYtCZMsRArZKAJ0ajbLzNXZiucBAbCmImEmtAMNBOgCeI3OF
-xaU2B2arUgFktKop9jWUu3o=
-=tBkE
------END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.23.4-r1.ebuild b/sys-apps/dbus/dbus-0.23.4-r1.ebuild
index d2681a6d7b41..863cb26308f3 100644
--- a/sys-apps/dbus/dbus-0.23.4-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.23.4-r1.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/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.15 2006/02/16 21:15:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.16 2006/04/09 16:56:28 steev Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib qt3
 
 # FIXME : fix docs
-#IUSE="X gtk qt python mono doc xml2"
-IUSE="X gtk qt python mono xml2"
+#IUSE="X gtk qt python mono doc xml"
+IUSE="X gtk qt python mono xml"
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
 HOMEPAGE="http://dbus.freedesktop.org/"
@@ -18,8 +18,8 @@ LICENSE="|| ( GPL-2 AFL-2.1 )"
 KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 
 RDEPEND=">=dev-libs/glib-2
-	xml2? ( >=dev-libs/libxml2-2.6 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	!xml? ( dev-libs/expat )
 	X? (
 		|| (
 			(
@@ -70,7 +70,7 @@ src_compile() {
 
 	local myconf
 
-	if use xml2; then
+	if use xml; then
 		myconf="--with-xml=libxml";
 	else
 		myconf="--with-xml=expat";
diff --git a/sys-apps/dbus/dbus-0.50-r1.ebuild b/sys-apps/dbus/dbus-0.50-r1.ebuild
index f6004898dad3..d41e48772a0f 100644
--- a/sys-apps/dbus/dbus-0.50-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.50-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r1.ebuild,v 1.5 2006/01/19 20:40:35 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r1.ebuild,v 1.6 2006/04/09 16:56:28 steev Exp $
 
 inherit eutils mono python multilib autotools debug qt3
 
-IUSE="X gtk qt python mono doc xml2"
+IUSE="X gtk qt python mono doc xml"
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
 HOMEPAGE="http://dbus.freedesktop.org/"
@@ -15,8 +15,8 @@ LICENSE="|| ( GPL-2 AFL-2.1 )"
 KEYWORDS="~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-libs/glib-2.6
-	xml2? ( dev-libs/libxml2 )
-	!xml2? ( dev-libs/expat )
+	xml? ( dev-libs/libxml2 )
+	!xml? ( dev-libs/expat )
 	X? ( || (
 		(
 		x11-libs/libXt
@@ -57,7 +57,7 @@ src_compile() {
 	local myconf
 
 	# Choose which xml library to use
-	if use xml2; then
+	if use xml; then
 		myconf="--with-xml=libxml"
 	else
 		myconf="--with-xml=expat"
diff --git a/sys-apps/dbus/dbus-0.50-r2.ebuild b/sys-apps/dbus/dbus-0.50-r2.ebuild
index aedd46bc7dfc..414ba93069f9 100644
--- a/sys-apps/dbus/dbus-0.50-r2.ebuild
+++ b/sys-apps/dbus/dbus-0.50-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r2.ebuild,v 1.6 2006/01/19 20:40:35 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r2.ebuild,v 1.7 2006/04/09 16:56:28 steev Exp $
 
 inherit eutils mono python multilib autotools debug qt3
 
-IUSE="X gtk qt python mono doc xml2"
+IUSE="X gtk qt python mono doc xml"
 # gcj - this still doesnt work properly
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
@@ -16,8 +16,8 @@ LICENSE="|| ( GPL-2 AFL-2.1 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-libs/glib-2.6
-	xml2? ( >=dev-libs/libxml2-2.6.21 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.6.21 )
+	!xml? ( dev-libs/expat )
 	X? ( || (
 		(
 		x11-libs/libXt
@@ -64,7 +64,7 @@ src_compile() {
 	local myconf=""
 
 	# Choose which xml library to use
-	if use xml2; then
+	if use xml; then
 		myconf="${myconf} --with-xml=libxml"
 	else
 		myconf="${myconf} --with-xml=expat"
diff --git a/sys-apps/dbus/dbus-0.60-r3.ebuild b/sys-apps/dbus/dbus-0.60-r3.ebuild
index 5f7136791fe5..c6e6213a453d 100644
--- a/sys-apps/dbus/dbus-0.60-r3.ebuild
+++ b/sys-apps/dbus/dbus-0.60-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r3.ebuild,v 1.14 2006/02/07 22:20:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r3.ebuild,v 1.15 2006/04/09 16:56:28 steev Exp $
 
 inherit eutils mono python multilib debug qt3 autotools toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 SLOT="0"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="doc gcj gtk mono python qt selinux X xml2"
+IUSE="doc gcj gtk mono python qt selinux X xml"
 
 RDEPEND=">=dev-libs/glib-2.6
 	X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) )
@@ -20,8 +20,8 @@ RDEPEND=">=dev-libs/glib-2.6
 	python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
 	qt? ( $(qt_min_version 3.3) )
 	selinux? ( sys-libs/libselinux )
-	xml2? ( >=dev-libs/libxml2-2.6.21 )
-	!xml2? ( dev-libs/expat )"
+	xml? ( >=dev-libs/libxml2-2.6.21 )
+	!xml? ( dev-libs/expat )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -60,7 +60,7 @@ src_compile() {
 	local myconf=""
 
 	# Choose which xml library to use
-	if use xml2; then
+	if use xml; then
 		myconf="${myconf} --with-xml=libxml"
 	else
 		myconf="${myconf} --with-xml=expat"
diff --git a/sys-apps/dbus/dbus-0.60-r4.ebuild b/sys-apps/dbus/dbus-0.60-r4.ebuild
index efacd420fcdc..3e26fc93407e 100644
--- a/sys-apps/dbus/dbus-0.60-r4.ebuild
+++ b/sys-apps/dbus/dbus-0.60-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r4.ebuild,v 1.13 2006/03/14 03:33:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r4.ebuild,v 1.14 2006/04/09 16:56:28 steev Exp $
 
 inherit eutils mono python multilib debug qt3 autotools toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc gcj gtk mono python qt selinux X xml2"
+IUSE="doc gcj gtk mono python qt selinux X xml"
 
 RDEPEND=">=dev-libs/glib-2.6
 	X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) )
@@ -20,8 +20,8 @@ RDEPEND=">=dev-libs/glib-2.6
 	python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
 	qt? ( $(qt_min_version 3.3) )
 	selinux? ( sys-libs/libselinux )
-	xml2? ( >=dev-libs/libxml2-2.6.21 )
-	!xml2? ( dev-libs/expat )"
+	xml? ( >=dev-libs/libxml2-2.6.21 )
+	!xml? ( dev-libs/expat )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -64,7 +64,7 @@ src_compile() {
 	local myconf=""
 
 	# Choose which xml library to use
-	if use xml2; then
+	if use xml; then
 		myconf="${myconf} --with-xml=libxml"
 	else
 		myconf="${myconf} --with-xml=expat"