From: "Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libwmf: libwmf-0.2.8.4-r4.ebuild ChangeLog
Date: Sun, 17 Jul 2011 19:24:33 +0000 (UTC) [thread overview]
Message-ID: <20110717192433.3818B2004B@flycatcher.gentoo.org> (raw)
scarabeus 11/07/17 19:24:33
Modified: libwmf-0.2.8.4-r4.ebuild ChangeLog
Log:
Reorder xml and expat useflags in order to fix bug #373919. This cause no factical change, just reorders the use deps bit so it is more reasonable wrt xml useflag.
(Portage version: 2.2.0_alpha45/cvs/Linux x86_64)
Revision Changes Path
1.6 media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild?r1=1.5&r2=1.6
Index: libwmf-0.2.8.4-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libwmf-0.2.8.4-r4.ebuild 17 Jul 2011 14:40:15 -0000 1.5
+++ libwmf-0.2.8.4-r4.ebuild 17 Jul 2011 19:24:33 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.4-r4.ebuild,v 1.5 2011/07/17 14:40:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild,v 1.6 2011/07/17 19:24:33 scarabeus Exp $
EAPI=4
@@ -26,8 +26,10 @@
sys-libs/zlib
x11-libs/gdk-pixbuf:2[X?]
virtual/jpeg
- expat? ( dev-libs/expat )
- xml? ( dev-libs/libxml2 )
+ xml? (
+ expat? ( dev-libs/expat )
+ !expat? ( dev-libs/libxml2 )
+ )
X? (
x11-libs/libICE
x11-libs/libSM
@@ -42,7 +44,7 @@
)"
# plotutils are not really supported yet, so looks like that's it
-REQUIRED_USE="xml? ( !expat ) expat? ( !xml )"
+REQUIRED_USE="expat? ( xml )"
DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
@@ -62,15 +64,22 @@
}
src_configure() {
+ local myconf
# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
# we're explicitly disabling gd use w.r.t. bug 268161
+ if use expat; then
+ myconf+=" --disable-libxml2"
+ else
+ myconf+=$(use_with xml libxml2)
+ fi
+
econf \
--disable-static \
$(use_enable debug) \
$(use_with X x) \
$(use_with expat) \
- $(use_with xml libxml2) \
+ ${myconf} \
--disable-gd \
--with-sys-gd \
--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts \
1.75 media-libs/libwmf/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/ChangeLog?r1=1.74&r2=1.75
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog 17 Jul 2011 14:40:15 -0000 1.74
+++ ChangeLog 17 Jul 2011 19:24:33 -0000 1.75
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/libwmf
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.74 2011/07/17 14:40:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.75 2011/07/17 19:24:33 scarabeus Exp $
+
+ 17 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libwmf-0.2.8.4-r4.ebuild:
+ Reorder xml and expat useflags in order to fix bug #373919. This cause no
+ factical change, just reorders the use deps bit so it is more reasonable wrt
+ xml useflag.
17 Jul 2011; Markus Meier <maekke@gentoo.org> libwmf-0.2.8.4-r4.ebuild:
x86 stable, bug #373889
next reply other threads:[~2011-07-17 19:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 19:24 Tomas Chvatal (scarabeus) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-12 6:59 [gentoo-commits] gentoo-x86 commit in media-libs/libwmf: libwmf-0.2.8.4-r4.ebuild ChangeLog Pacho Ramos (pacho)
2012-05-09 17:33 Alexis Ballier (aballier)
2012-02-15 18:54 Fabian Groffen (grobian)
2011-08-20 16:04 Jeroen Roovers (jer)
2011-07-25 14:43 Kacper Kowalik (xarthisius)
2011-07-23 19:08 Raul Porcel (armin76)
2011-07-17 14:40 Markus Meier (maekke)
2011-07-12 21:17 Markus Meier (maekke)
2011-07-10 15:54 Markos Chandras (hwoarang)
2011-07-01 21:03 Tomas Chvatal (scarabeus)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110717192433.3818B2004B@flycatcher.gentoo.org \
--to=scarabeus@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox