Purposefully dropped the xml USE flag and libxml2 support. Having this is

silly since expat is the preferred way to go per upstream and libxml2 support
simply exists as a fallback when expat isn't around. expat support is the main
way to go and every other distro uses it. By using the xml USE flag to enable
libxml2 support, this confuses users and results in most people getting the
non-standard behavior of libxml2 usage since most profiles have USE=xml
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64)

2 files changed, 23 insertions, 6 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index ebc4018b5e71..2f33e9aa5e21 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.119 2008/06/25 21:03:18 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.120 2008/06/26 21:38:55 cardoe Exp $
+
+*fontconfig-2.6.0-r2 (26 Jun 2008)
+
+  26 Jun 2008; Doug Goldstein <cardoe@gentoo.org>
+  -fontconfig-2.6.0-r1.ebuild, +fontconfig-2.6.0-r2.ebuild:
+  Purposefully dropped the xml USE flag and libxml2 support. Having this is
+  silly since expat is the preferred way to go per upstream and libxml2
+  support simply exists as a fallback when expat isn't around. expat support
+  is the main way to go and every other distro uses it. By using the xml USE
+  flag to enable libxml2 support, this confuses users and results in most
+  people getting the non-standard behavior of libxml2 usage since most
+  profiles have USE=xml
 
   25 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
   fontconfig-2.6.0-r1.ebuild:
diff --git a/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
index d98e814585f3..78168b179e64 100644
--- a/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r1.ebuild,v 1.3 2008/06/25 21:03:18 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.1 2008/06/26 21:38:55 cardoe Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -13,11 +13,17 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
 LICENSE="fontconfig"
 SLOT="1.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc xml"
+IUSE="doc"
+
+# Purposefully dropped the xml USE flag and libxml2 support. Having this is
+# silly since expat is the preferred way to go per upstream and libxml2 support
+# simply exists as a fallback when expat isn't around. expat support is the main
+# way to go and every other distro uses it. By using the xml USE flag to enable
+# libxml2 support, this confuses users and results in most people getting the
+# non-standard behavior of libxml2 usage since most profiles have USE=xml
 
 RDEPEND=">=media-libs/freetype-2.1.4
-	!xml? ( >=dev-libs/expat-1.95.3 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
+	>=dev-libs/expat-1.95.3"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-text/docbook-sgml-utils )"
@@ -42,7 +48,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--with-default-fonts=/usr/share/fonts \
 		--with-add-fonts=/usr/local/share/fonts \
-		$(use_enable xml libxml2) \
 		|| die
 
 	emake || die