Change USE=xml2 to USE=xml #116346.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 44 insertions, 40 deletions

diff --git a/media-libs/raptor/ChangeLog b/media-libs/raptor/ChangeLog
index c034a5d347fa..35618dd518b7 100644
--- a/media-libs/raptor/ChangeLog
+++ b/media-libs/raptor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/raptor
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.32 2006/01/08 09:10:45 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.33 2006/04/02 20:13:44 vapier Exp $
+
+  02 Apr 2006; Mike Frysinger <vapier@gentoo.org> raptor-1.4.7.ebuild,
+  raptor-1.4.8.ebuild:
+  Change USE=xml2 to USE=xml #116346.
 
   08 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org> raptor-1.4.7.ebuild:
   ppc stable, bug #117678
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 82524f4d9c93..dff0d68fbf6c 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6e0e2283b6cfe121d7f6144f73ca1297 ChangeLog 3717
-RMD160 3191e3764d6205be0c881faebdd836900e941570 ChangeLog 3717
-SHA256 03a1fa7ce94e55fee8a6a44dc7811ac85973f151e52487e0bae04413cd06c797 ChangeLog 3717
+MD5 ad9b5623d32b3ba8434d4c3cd5616015 ChangeLog 3846
+RMD160 278c9f4e077b598d184e521ba1e1eca43b0a5103 ChangeLog 3846
+SHA256 a9f49eeaa8ced1c5914da6a10b78ee78e583aee02d8e16107bca683b8d1c1ba5 ChangeLog 3846
 MD5 a9760c67971a37403703a4eaaec19d21 files/digest-raptor-1.4.7 65
 RMD160 a6fae6f768180f63b81e156d83af2155a96b0197 files/digest-raptor-1.4.7 65
 SHA256 57497c7fab9b90fdbbdc8aff531353f0b3372219cca2d8a63445e73750d84f66 files/digest-raptor-1.4.7 65
@@ -13,16 +13,16 @@ SHA256 f475c09ca7596355d303036cd8939fe631dcedb842f945d13f345297d6a7112a files/di
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 35f9475a39d7c02cfd66b730134aaf0d raptor-1.4.7.ebuild 2170
-RMD160 f99063e5d9d6a6490558c16477f377c916669b75 raptor-1.4.7.ebuild 2170
-SHA256 7bacdbd0e266fd34e99db1fdf30163c0012f7cb65d47b94b58b0d06ed94a0c99 raptor-1.4.7.ebuild 2170
-MD5 4fc14337128a9946232d6d5aff792898 raptor-1.4.8.ebuild 2172
-RMD160 05bb42aee994c7d54aad3d8fec9cc763836af13b raptor-1.4.8.ebuild 2172
-SHA256 5aef10d91d62031e5a2f69e216953b0e435fa44cf2a4fae6c0fa237aeda65694 raptor-1.4.8.ebuild 2172
+MD5 1857168abfa147520a4d0d1b109f616d raptor-1.4.7.ebuild 2155
+RMD160 80b015ee157f10052ea19768291de54b9dfaf117 raptor-1.4.7.ebuild 2155
+SHA256 51dc560ede54d6b4c03b597cd208e3cff46a171412d39501e1614e6c8b5730db raptor-1.4.7.ebuild 2155
+MD5 482fbd2d3a7f33faaaccd5c837ca7027 raptor-1.4.8.ebuild 2160
+RMD160 5366a00ad9431f506016d652dbf9137fac01941a raptor-1.4.8.ebuild 2160
+SHA256 74c9500eb30dde9069b0e3b376dc2e0e753bc177fc084bf8aa25596d093fc0d7 raptor-1.4.8.ebuild 2160
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEA8fO2+ySkm8kpY0RAqvHAKCKS7W3Qjfo8YmG4erCBoBPzCSK7wCfV+i/
-uxzqPYRq8wdJV1lupJMzQSQ=
-=tu8N
+iD8DBQFEMDCb2+ySkm8kpY0RApoOAKDGV8kXJaZoSI9DucmvOdZB7Pa1QACgh46g
+wBykdg+ErWvktRAvY4+YNKI=
+=9BVe
 -----END PGP SIGNATURE-----
diff --git a/media-libs/raptor/raptor-1.4.7.ebuild b/media-libs/raptor/raptor-1.4.7.ebuild
index 3c42300b376b..86fc8136b19a 100644
--- a/media-libs/raptor/raptor-1.4.7.ebuild
+++ b/media-libs/raptor/raptor-1.4.7.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/media-libs/raptor/raptor-1.4.7.ebuild,v 1.9 2006/01/08 09:10:45 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-1.4.7.ebuild,v 1.10 2006/04/02 20:13:44 vapier Exp $
 
 inherit eutils
 
@@ -11,34 +11,34 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 LICENSE="LGPL-2 Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc ~ppc-macos ppc64 sparc x86"
-IUSE="curl xml2 gnome ssl"
+IUSE="curl xml gnome ssl"
 
 DEPEND="virtual/libc
 	gnome? ( >=dev-libs/glib-2.2.1 dev-util/pkgconfig )
-	xml2? ( >=dev-libs/libxml2-2.4.0 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.0 )
+	!xml? ( dev-libs/expat )
 	ssl? ( dev-libs/openssl )
 	curl? ( net-misc/curl )"
 RDEPEND="virtual/libc
 	gnome? ( >=dev-libs/glib-2.2.1 )
-	xml2? ( >=dev-libs/libxml2-2.4.0 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.0 )
+	!xml? ( dev-libs/expat )
 	ssl? ( dev-libs/openssl )
 	curl? ( net-misc/curl )"
 
 # compilation with libwww currently breaks and for using libfetch I didn't find the right USE flag
-#IUSE="curl xml2 libwww gnome"  
+#IUSE="curl xml libwww gnome"  
 #DEPEND="virtual/libc
 #	gnome? ( >=dev-libs/glib-2.2.1 dev-util/pkgconfig )
-#	xml2? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
+#	xml? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
 #	ssl? ( dev-libs/openssl )
-#	curl? ( net-misc/curl ) : ( !xml2? ( libwww? ( net-libs/libwww ) ) )
+#	curl? ( net-misc/curl ) : ( !xml? ( libwww? ( net-libs/libwww ) ) )
 #	"
 #RDEPEND="virtual/libc
 #	gnome? ( >=dev-libs/glib-2.2.1 )
-#	xml2? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
+#	xml? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
 #	ssl? ( dev-libs/openssl )
-#	curl? ( net-misc/curl ) : ( !xml2? ( libwww? ( net-libs/libwww ) ) )"
+#	curl? ( net-misc/curl ) : ( !xml? ( libwww? ( net-libs/libwww ) ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -48,13 +48,13 @@ src_unpack() {
 src_compile() {
 	local myraptorconf=""
 
-	use xml2 \
+	use xml \
 		&& myraptorconf="${myraptorconf} --with-xml-parser=libxml" \
 		|| myraptorconf="${myraptorconf} --with-xml-parser=expat"
 
 	if use curl ; then
 		myraptorconf="${myraptorconf} --with-www=curl"
-	elif use xml2 ; then
+	elif use xml ; then
 		myraptorconf="${myraptorconf} --with-www=xml"
 #	elif use libwww ;
 #		myraptorconf="${myraptorconf} --with-www=libwww"
diff --git a/media-libs/raptor/raptor-1.4.8.ebuild b/media-libs/raptor/raptor-1.4.8.ebuild
index b1369141a471..0798802abcda 100644
--- a/media-libs/raptor/raptor-1.4.8.ebuild
+++ b/media-libs/raptor/raptor-1.4.8.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/media-libs/raptor/raptor-1.4.8.ebuild,v 1.1 2006/01/04 00:28:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-1.4.8.ebuild,v 1.2 2006/04/02 20:13:44 vapier Exp $
 
 inherit eutils
 
@@ -11,34 +11,34 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 LICENSE="LGPL-2 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="curl xml2 gnome ssl"
+IUSE="curl xml gnome ssl"
 
 DEPEND="virtual/libc
 	gnome? ( >=dev-libs/glib-2.2.1 dev-util/pkgconfig )
-	xml2? ( >=dev-libs/libxml2-2.4.0 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.0 )
+	!xml? ( dev-libs/expat )
 	ssl? ( dev-libs/openssl )
 	curl? ( net-misc/curl )"
 RDEPEND="virtual/libc
 	gnome? ( >=dev-libs/glib-2.2.1 )
-	xml2? ( >=dev-libs/libxml2-2.4.0 )
-	!xml2? ( dev-libs/expat )
+	xml? ( >=dev-libs/libxml2-2.4.0 )
+	!xml? ( dev-libs/expat )
 	ssl? ( dev-libs/openssl )
 	curl? ( net-misc/curl )"
 
 # compilation with libwww currently breaks and for using libfetch I didn't find the right USE flag
-#IUSE="curl xml2 libwww gnome"  
+#IUSE="curl xml libwww gnome"  
 #DEPEND="virtual/libc
 #	gnome? ( >=dev-libs/glib-2.2.1 dev-util/pkgconfig )
-#	xml2? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
+#	xml? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
 #	ssl? ( dev-libs/openssl )
-#	curl? ( net-misc/curl ) : ( !xml2? ( libwww? ( net-libs/libwww ) ) )
+#	curl? ( net-misc/curl ) : ( !xml? ( libwww? ( net-libs/libwww ) ) )
 #	"
 #RDEPEND="virtual/libc
 #	gnome? ( >=dev-libs/glib-2.2.1 )
-#	xml2? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
+#	xml? ( >=dev-libs/libxml2-2.4.0 ) : ( dev-libs/expat )
 #	ssl? ( dev-libs/openssl )
-#	curl? ( net-misc/curl ) : ( !xml2? ( libwww? ( net-libs/libwww ) ) )"
+#	curl? ( net-misc/curl ) : ( !xml? ( libwww? ( net-libs/libwww ) ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -48,13 +48,13 @@ src_unpack() {
 src_compile() {
 	local myraptorconf=""
 
-	use xml2 \
+	use xml \
 		&& myraptorconf="${myraptorconf} --with-xml-parser=libxml" \
 		|| myraptorconf="${myraptorconf} --with-xml-parser=expat"
 
 	if use curl ; then
 		myraptorconf="${myraptorconf} --with-www=curl"
-	elif use xml2 ; then
+	elif use xml ; then
 		myraptorconf="${myraptorconf} --with-www=xml"
 #	elif use libwww ;
 #		myraptorconf="${myraptorconf} --with-www=libwww"