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-r3.ebuild ChangeLog
Date: Mon, 23 May 2011 17:18:32 +0000 (UTC) [thread overview]
Message-ID: <20110523171832.BB76E20054@flycatcher.gentoo.org> (raw)
scarabeus 11/05/23 17:18:32
Modified: libwmf-0.2.8.4-r3.ebuild ChangeLog
Log:
Fixup building with png-1.5. Move to EAPI=4. Drop static libs.
(Portage version: 2.2.0_alpha35/cvs/Linux x86_64)
Revision Changes Path
1.13 media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild?r1=1.12&r2=1.13
Index: libwmf-0.2.8.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libwmf-0.2.8.4-r3.ebuild 28 Mar 2011 16:51:26 -0000 1.12
+++ libwmf-0.2.8.4-r3.ebuild 23 May 2011 17:18:32 -0000 1.13
@@ -1,8 +1,8 @@
# 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-r3.ebuild,v 1.12 2011/03/28 16:51:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild,v 1.13 2011/05/23 17:18:32 scarabeus Exp $
-EAPI="3"
+EAPI=4
inherit eutils autotools
@@ -20,7 +20,7 @@
IUSE="X expat xml debug doc gtk"
RDEPEND="app-text/ghostscript-gpl
- xml? ( !expat? ( dev-libs/libxml2 ) )
+ xml? ( dev-libs/libxml2 )
expat? ( dev-libs/expat )
>=media-libs/freetype-2.0.1
sys-libs/zlib
@@ -40,40 +40,33 @@
)"
# plotutils are not really supported yet, so looks like that's it
+REQUIRED_USE="xml? ( !expat ) expat? ( !xml )"
+
src_prepare() {
if ! use doc ; then
- sed -e 's:doc::' -i Makefile.am
- fi
- if ! use gtk ; then
- sed -e 's:@LIBWMF_GDK_PIXBUF_TRUE@:#:' -i src/Makefile.in
+ sed -e 's:doc::' -i Makefile.am || die
fi
- epatch "${FILESDIR}"/${P}-intoverflow.patch \
+ epatch \
+ "${FILESDIR}"/${P}-intoverflow.patch \
"${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-pngfix.patch
+ "${FILESDIR}"/${P}-pngfix.patch \
+ "${FILESDIR}"/${P}-libpng-1.5.patch
eautoreconf
}
src_configure() {
- if use expat && use xml ; then
- elog "You can specify only one USE flag from expat and xml, to use expat"
- elog "or libxml2, respectively."
- elog
- elog "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 xml libxml2)"
- fi
-
# 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
econf \
+ --disable-static \
$(use_enable debug) \
$(use_with X x) \
+ $(use_with expat) \
+ $(use_with xml libxml2) \
--disable-gd \
--with-sys-gd \
- ${myconf} \
--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts \
--with-fontdir="${EPREFIX}"/usr/share/libwmf/fonts/ \
--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
@@ -81,7 +74,7 @@
src_install() {
# bug #298596
- emake -j1 install DESTDIR="${D}" || die
+ emake -j1 install DESTDIR="${D}"
dodoc README AUTHORS CREDITS ChangeLog NEWS TODO
find "${ED}" -name '*.la' -exec rm -f '{}' +
1.70 media-libs/libwmf/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/ChangeLog?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/ChangeLog?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/ChangeLog?r1=1.69&r2=1.70
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog 28 Mar 2011 16:51:26 -0000 1.69
+++ ChangeLog 23 May 2011 17:18:32 -0000 1.70
@@ -1,6 +1,10 @@
# 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.69 2011/03/28 16:51:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.70 2011/05/23 17:18:32 scarabeus Exp $
+
+ 23 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libwmf-0.2.8.4-r3.ebuild, +files/libwmf-0.2.8.4-libpng-1.5.patch:
+ Fixup building with png-1.5. Move to EAPI=4. Drop static libs.
28 Mar 2011; Christoph Mende <angelos@gentoo.org> libwmf-0.2.8.4-r3.ebuild:
Fixed gtk+ dep
next reply other threads:[~2011-05-23 17:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-23 17:18 Tomas Chvatal (scarabeus) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-28 16:51 [gentoo-commits] gentoo-x86 commit in media-libs/libwmf: libwmf-0.2.8.4-r3.ebuild ChangeLog Christoph Mende (angelos)
2010-11-11 10:26 Samuli Suominen (ssuominen)
2010-04-06 17:14 Jonathan Callen (abcd)
2009-12-28 0:41 Diego Petteno (flameeyes)
2009-05-18 18:53 Brent Baude (ranger)
2009-05-13 18:21 Markus Meier (maekke)
2009-05-12 17:47 Raul Porcel (armin76)
2009-05-12 13:34 Ferris McCormick (fmccor)
2009-05-12 4:21 Jeroen Roovers (jer)
2009-05-11 21:42 Christian Faulhammer (fauli)
2009-05-10 23:52 Peter Alfredsen (loki_val)
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=20110523171832.BB76E20054@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