Use xml USE flag instead of xml2. Bug #116346.

Package-Manager: portage-2.1_rc3-r2

3 files changed, 46 insertions, 18 deletions

diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog
index 9b7b219ae9b2..a8872965992d 100644
--- a/media-libs/libwmf/ChangeLog
+++ b/media-libs/libwmf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libwmf
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.32 2005/12/22 04:20:32 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.33 2006/06/03 20:48:45 ticho Exp $
+
+  03 Jun 2006; Andrej Kacian <ticho@gentoo.org> libwmf-0.2.8.3-r1.ebuild:
+  Use xml USE flag instead of xml2. Bug #116346.
 
   22 Dec 2005; Mike Frysinger <vapier@gentoo.org> libwmf-0.2.8.3-r1.ebuild:
   Change USE=xml to USE=expat.
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 1ecbd2847e71..154b0f3585b5 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1,18 +1,41 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 07eaefa258688eebc66356f58b52354e ChangeLog 4894
-MD5 14afcb5bd6052022844997041dd5b26f files/digest-libwmf-0.2.8.2 67
-MD5 1fae183299bc22899b34f76cdaff03eb files/digest-libwmf-0.2.8.3 67
-MD5 1fae183299bc22899b34f76cdaff03eb files/digest-libwmf-0.2.8.3-r1 67
+DIST libwmf-0.2.8.2.tar.gz 1642727
+DIST libwmf-0.2.8.3.tar.gz 1750358
+EBUILD libwmf-0.2.8.2.ebuild 1654 RMD160 f34b11a901212a2b86cf64c169b8c0e5e9e32650 SHA1 9e9c39b543b8c52d1594d346dca8fee2c7ca1e43 SHA256 25b63fc402564de4eba59db1afed721179c4d82f5df0cb6c4b6242b76324ffb1
 MD5 bd5e4bda6b3b055f8812bc6e9fdfa73e libwmf-0.2.8.2.ebuild 1654
-MD5 1bba7ae21996fde4292d032260557595 libwmf-0.2.8.3-r1.ebuild 2435
+RMD160 f34b11a901212a2b86cf64c169b8c0e5e9e32650 libwmf-0.2.8.2.ebuild 1654
+SHA256 25b63fc402564de4eba59db1afed721179c4d82f5df0cb6c4b6242b76324ffb1 libwmf-0.2.8.2.ebuild 1654
+EBUILD libwmf-0.2.8.3-r1.ebuild 2516 RMD160 5ae3edd677ff6300e3df15320b8cf5bf00a13c2b SHA1 87a4b40d572eec758d1ec2860679ab2eaeb9444e SHA256 38262d4c84d9646deb571e5f6e7038d011a723f20cc11b46b97299cf9f6a4192
+MD5 f4a94909edff293cf97db4d9aad3d389 libwmf-0.2.8.3-r1.ebuild 2516
+RMD160 5ae3edd677ff6300e3df15320b8cf5bf00a13c2b libwmf-0.2.8.3-r1.ebuild 2516
+SHA256 38262d4c84d9646deb571e5f6e7038d011a723f20cc11b46b97299cf9f6a4192 libwmf-0.2.8.3-r1.ebuild 2516
+EBUILD libwmf-0.2.8.3.ebuild 1659 RMD160 b21a13f398f6b8b36c104e3a310a1f7d6642cac4 SHA1 fb1d06482cf03dc1a71218ce4cc75e73bc5c4784 SHA256 8d23f0a0b046a3b76da26d5cd75a0e1c87f6a52792f1b460e5dadbca32aea8fa
 MD5 ffe35adf5ebf119b9f76bb83d47e22fa libwmf-0.2.8.3.ebuild 1659
+RMD160 b21a13f398f6b8b36c104e3a310a1f7d6642cac4 libwmf-0.2.8.3.ebuild 1659
+SHA256 8d23f0a0b046a3b76da26d5cd75a0e1c87f6a52792f1b460e5dadbca32aea8fa libwmf-0.2.8.3.ebuild 1659
+MISC ChangeLog 5017 RMD160 a78a87dd2cabd5d5cdc7a29c647da96ebd1a39ff SHA1 99a9bb324067ee7f03bfd15bf6e694038f565568 SHA256 5443906374d871bba517c626cc68e2ba9e0ef170497dbe93a9d8293ce40d6583
+MD5 e593266ac92bf86df035a8bd8f93cc1d ChangeLog 5017
+RMD160 a78a87dd2cabd5d5cdc7a29c647da96ebd1a39ff ChangeLog 5017
+SHA256 5443906374d871bba517c626cc68e2ba9e0ef170497dbe93a9d8293ce40d6583 ChangeLog 5017
+MISC metadata.xml 198 RMD160 ecb3dd5b9b5c15998184dfda3dd755184141cac2 SHA1 2f9abf78f7ff06b358d4462b4aecfce8774ac7a3 SHA256 0ada8d2cad084a20adb963bc7d24f6d332fc599e8ef2d25bf053561ad2b98c07
 MD5 56e3c453f3fa414649d2454a760fad1f metadata.xml 198
+RMD160 ecb3dd5b9b5c15998184dfda3dd755184141cac2 metadata.xml 198
+SHA256 0ada8d2cad084a20adb963bc7d24f6d332fc599e8ef2d25bf053561ad2b98c07 metadata.xml 198
+MD5 14afcb5bd6052022844997041dd5b26f files/digest-libwmf-0.2.8.2 67
+RMD160 a00473097254983d74f71075338d3dea667fce01 files/digest-libwmf-0.2.8.2 67
+SHA256 a1d096cf717d81d2abb54e7cfe7482272b6818a58d22cd05dca270bd22e21929 files/digest-libwmf-0.2.8.2 67
+MD5 1fae183299bc22899b34f76cdaff03eb files/digest-libwmf-0.2.8.3 67
+RMD160 2ca5e604b647b1f2e0ca75aafce7e6e0c3c74706 files/digest-libwmf-0.2.8.3 67
+SHA256 de014e8cb593da023a87c1fe9a5b2620b32d073e84a6a0465c3f68d05a0be42f files/digest-libwmf-0.2.8.3 67
+MD5 1fae183299bc22899b34f76cdaff03eb files/digest-libwmf-0.2.8.3-r1 67
+RMD160 2ca5e604b647b1f2e0ca75aafce7e6e0c3c74706 files/digest-libwmf-0.2.8.3-r1 67
+SHA256 de014e8cb593da023a87c1fe9a5b2620b32d073e84a6a0465c3f68d05a0be42f files/digest-libwmf-0.2.8.3-r1 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFDy2fH2+ySkm8kpY0RAqLIAJ9xWSRfxi55/SIqyOccI9eCXna7rgCgwj5L
-Gw67mQYGCCZ0TKxmNJgI+xM=
-=HUw2
+iD8DBQFEgfWvQlM6RnzZP+IRAsDwAKC8dzzC3hz5ExWsljYR1uvGnT2oMACfbivD
+O/VkNFfQ/GeURtBobTUHF3c=
+=c2+f
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libwmf/libwmf-0.2.8.3-r1.ebuild b/media-libs/libwmf/libwmf-0.2.8.3-r1.ebuild
index f6ab5a9cd632..75fb81490e5d 100644
--- a/media-libs/libwmf/libwmf-0.2.8.3-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.3-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/media-libs/libwmf/libwmf-0.2.8.3-r1.ebuild,v 1.8 2006/01/16 09:28:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.3-r1.ebuild,v 1.9 2006/06/03 20:48:45 ticho Exp $
 
 inherit libtool
 
@@ -15,10 +15,10 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
-IUSE="jpeg X expat xml2 debug doc gtk"
+IUSE="jpeg X expat xml debug doc gtk"
 
 RDEPEND="virtual/ghostscript
-	xml2? ( !expat? ( dev-libs/libxml2 ) )
+	xml? ( !expat? ( dev-libs/libxml2 ) )
 	expat? ( dev-libs/expat )
 	>=media-libs/freetype-2.0.1
 	sys-libs/zlib
@@ -63,12 +63,14 @@ src_compile() {
 	#still needed !? <vapier@gentoo.org>
 	#elibtoolize --reverse-deps
 
-	if use expat && use xml2; then
-		einfo "You can specify only one flag of expat and xml2."
-		einfo "It will be defaulted to expat (like autocheck does)."
+	if use expat && use xml; then
+		einfo "You can specify only one USE flag from expat and xml, to use expat"
+		einfo "or libxml2, respectively."
+		einfo
+		einfo "You have both flags enabled, we will default to expat (like autocheck does)."
 		myconf="${myconf} --with-expat --without-libxml2"
 	else
-		myconf="${myconf} $(use_with expat) $(use_with xml2 libxml2)"
+		myconf="${myconf} $(use_with expat) $(use_with xml libxml2)"
 	fi
 
 	econf \