diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2006-06-03 20:48:45 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2006-06-03 20:48:45 +0000 |
| commit | c1f350222065f372fe340469ab48ff0f5ce6e658 (patch) | |
| tree | 778935d81e29c971205de7470c132be023fa2661 /media-libs | |
| parent | Adding missing \\ to the ebuild, which prevents configure from completing suc... (diff) | |
| download | gentoo-2-c1f350222065f372fe340469ab48ff0f5ce6e658.tar.gz gentoo-2-c1f350222065f372fe340469ab48ff0f5ce6e658.tar.bz2 gentoo-2-c1f350222065f372fe340469ab48ff0f5ce6e658.zip | |
Use xml USE flag instead of xml2. Bug #116346.
(Portage version: 2.1_rc3-r2)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libwmf/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libwmf/libwmf-0.2.8.3-r1.ebuild | 16 |
2 files changed, 14 insertions, 9 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/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 \ |