xml2 use flag changed to xml

(Portage version: 2.1.1_pre2-r2)

8 files changed, 41 insertions, 34 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 9170092d43f7..1df02e9010ec 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.151 2006/05/17 17:24:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.152 2006/07/05 07:51:25 mr_bones_ Exp $
+
+  05 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  abiword-2.2.10.ebuild, abiword-2.2.11.ebuild, abiword-2.4.1.ebuild,
+  abiword-2.4.2.ebuild, abiword-2.4.2-r1.ebuild, abiword-2.4.4.ebuild:
+  xml2 use flag changed to xml
 
 *abiword-2.4.4 (17 May 2006)
 
diff --git a/app-office/abiword/abiword-2.2.10.ebuild b/app-office/abiword/abiword-2.2.10.ebuild
index 246b2a86b767..4b68733a1d4b 100644
--- a/app-office/abiword/abiword-2.2.10.ebuild
+++ b/app-office/abiword/abiword-2.2.10.ebuild
@@ -1,10 +1,10 @@
-# 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/app-office/abiword/abiword-2.2.10.ebuild,v 1.10 2005/12/14 15:21:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.10.ebuild,v 1.11 2006/07/05 07:51:25 mr_bones_ Exp $
 
 inherit eutils fdo-mime alternatives
 
-IUSE="gnome jpeg spell xml2 debug"
+IUSE="gnome jpeg spell xml debug"
 
 S_P=${S}/${PN}-plugins
 S=${WORKDIR}/${P}/abi
@@ -26,8 +26,8 @@ RDEPEND="virtual/xft
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	!xml? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1.1 )
 	gnome? ( >=gnome-base/libgnomeui-2.2
 		>=gnome-base/libgnomeprint-2.2.1
@@ -48,7 +48,7 @@ src_compile() {
 	econf \
 		`use_enable gnome` \
 		`use_enable gnome gucharmap` \
-		`use_with xml2 libxml2` \
+		`use_with xml libxml2` \
 		`use_enable spell enchant` \
 		`use_enable debug` \
 		--enable-threads \
diff --git a/app-office/abiword/abiword-2.2.11.ebuild b/app-office/abiword/abiword-2.2.11.ebuild
index 66deaf084596..8b9a5bd070de 100644
--- a/app-office/abiword/abiword-2.2.11.ebuild
+++ b/app-office/abiword/abiword-2.2.11.ebuild
@@ -1,10 +1,10 @@
-# 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/app-office/abiword/abiword-2.2.11.ebuild,v 1.10 2005/12/14 15:21:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.11.ebuild,v 1.11 2006/07/05 07:51:25 mr_bones_ Exp $
 
 inherit eutils fdo-mime alternatives
 
-IUSE="gnome jpeg spell xml2 debug"
+IUSE="gnome jpeg spell xml debug"
 
 S_P=${S}/${PN}-plugins
 S=${WORKDIR}/${P}/abi
@@ -27,8 +27,8 @@ RDEPEND="virtual/xft
 	>=dev-libs/fribidi-0.10.4
 	dev-libs/popt
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	!xml? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1.1 )
 	gnome? ( >=gnome-base/libgnomeui-2.2
 		>=gnome-base/libgnomeprint-2.2.1
@@ -49,7 +49,7 @@ src_compile() {
 	econf \
 		`use_enable gnome` \
 		`use_enable gnome gucharmap` \
-		`use_with xml2 libxml2` \
+		`use_with xml libxml2` \
 		`use_enable spell enchant` \
 		`use_enable debug` \
 		--enable-threads \
diff --git a/app-office/abiword/abiword-2.4.1.ebuild b/app-office/abiword/abiword-2.4.1.ebuild
index 4f48ff89f69b..55fc9e34dacf 100644
--- a/app-office/abiword/abiword-2.4.1.ebuild
+++ b/app-office/abiword/abiword-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-office/abiword/abiword-2.4.1.ebuild,v 1.3 2005/12/13 22:01:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.1.ebuild,v 1.4 2006/07/05 07:51:25 mr_bones_ Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.abisource.com/"
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnome spell xml2"
+IUSE="debug gnome spell xml"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -30,8 +30,8 @@ RDEPEND="virtual/xft
 	>=media-libs/fontconfig-2.1
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	!xml? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1.1 )
 	gnome? (
 		>=gnome-base/libbonobo-2
@@ -52,7 +52,7 @@ src_compile() {
 		$(use_enable gnome gucharmap) \
 		$(use_enable spell enchant)   \
 		$(use_enable debug)           \
-		$(use_with xml2 libxml2)      \
+		$(use_with xml libxml2)      \
 		--enable-threads    \
 		--disable-scripting \
 		--with-sys-wv"
diff --git a/app-office/abiword/abiword-2.4.2-r1.ebuild b/app-office/abiword/abiword-2.4.2-r1.ebuild
index 366ab0131e0b..e8fc19525e9b 100644
--- a/app-office/abiword/abiword-2.4.2-r1.ebuild
+++ b/app-office/abiword/abiword-2.4.2-r1.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/app-office/abiword/abiword-2.4.2-r1.ebuild,v 1.1 2006/03/10 20:01:48 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.2-r1.ebuild,v 1.2 2006/07/05 07:51:25 mr_bones_ Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.abisource.com/"
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnome spell xml2"
+IUSE="debug gnome spell xml"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -30,8 +30,8 @@ RDEPEND="virtual/xft
 	>=media-libs/fontconfig-2.1
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	!xml? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1.1 )
 	gnome? (
 		>=gnome-base/libbonobo-2
@@ -58,7 +58,7 @@ src_compile() {
 		$(use_enable gnome gucharmap) \
 		$(use_enable spell enchant)   \
 		$(use_enable debug)           \
-		$(use_with xml2 libxml2)      \
+		$(use_with xml libxml2)      \
 		--enable-threads    \
 		--disable-scripting \
 		--with-sys-wv"
diff --git a/app-office/abiword/abiword-2.4.2.ebuild b/app-office/abiword/abiword-2.4.2.ebuild
index e4b05853696d..f60ecd80e68e 100644
--- a/app-office/abiword/abiword-2.4.2.ebuild
+++ b/app-office/abiword/abiword-2.4.2.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/app-office/abiword/abiword-2.4.2.ebuild,v 1.1 2006/01/24 16:09:17 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.2.ebuild,v 1.2 2006/07/05 07:51:25 mr_bones_ Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.abisource.com/"
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnome spell xml2"
+IUSE="debug gnome spell xml"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -30,8 +30,8 @@ RDEPEND="virtual/xft
 	>=media-libs/fontconfig-2.1
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	!xml? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1.1 )
 	gnome? (
 		>=gnome-base/libbonobo-2
@@ -52,7 +52,7 @@ src_compile() {
 		$(use_enable gnome gucharmap) \
 		$(use_enable spell enchant)   \
 		$(use_enable debug)           \
-		$(use_with xml2 libxml2)      \
+		$(use_with xml libxml2)      \
 		--enable-threads    \
 		--disable-scripting \
 		--with-sys-wv"
diff --git a/app-office/abiword/abiword-2.4.4.ebuild b/app-office/abiword/abiword-2.4.4.ebuild
index 645f46ab6f62..2ffae1f650c5 100644
--- a/app-office/abiword/abiword-2.4.4.ebuild
+++ b/app-office/abiword/abiword-2.4.4.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/app-office/abiword/abiword-2.4.4.ebuild,v 1.1 2006/05/17 17:24:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.4.ebuild,v 1.2 2006/07/05 07:51:25 mr_bones_ Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.abisource.com/"
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnome spell xml2"
+IUSE="debug gnome spell xml"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -30,8 +30,8 @@ RDEPEND="virtual/xft
 	>=media-libs/fontconfig-2.1
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	!xml? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1.1 )
 	gnome? (
 		>=gnome-base/libbonobo-2
@@ -57,7 +57,7 @@ src_compile() {
 		$(use_enable gnome gucharmap) \
 		$(use_enable spell enchant)   \
 		$(use_enable debug)           \
-		$(use_with xml2 libxml2)      \
+		$(use_with xml libxml2)      \
 		--enable-threads    \
 		--disable-scripting \
 		--with-sys-wv"
diff --git a/app-office/abiword/files/digest-abiword-2.4.2 b/app-office/abiword/files/digest-abiword-2.4.2
index 97d98056a1a4..3fce9b5e6438 100644
--- a/app-office/abiword/files/digest-abiword-2.4.2
+++ b/app-office/abiword/files/digest-abiword-2.4.2
@@ -1 +1,3 @@
 MD5 935f1218eab7ff96b7a23cfeba4e76d1 abiword-2.4.2.tar.bz2 24729796
+RMD160 1b30dd7da238bd282abcce814a0b4d7c93e17199 abiword-2.4.2.tar.bz2 24729796
+SHA256 6a5921f9ab593637008bc0d5411ef9d8a689a4c89d9f7b273236331b14f66933 abiword-2.4.2.tar.bz2 24729796