diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-17 19:24:33 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-17 19:24:33 +0000 |
| commit | 992cfce2a6de3d629cfea6ce84d64fc70ef81cb6 (patch) | |
| tree | 160ae7ca082344938b4f06b415522d5659cfae22 /media-libs/libwmf | |
| parent | [sci-chemistry/gromacs] fix for bug #375473 (diff) | |
| download | historical-992cfce2a6de3d629cfea6ce84d64fc70ef81cb6.tar.gz historical-992cfce2a6de3d629cfea6ce84d64fc70ef81cb6.tar.bz2 historical-992cfce2a6de3d629cfea6ce84d64fc70ef81cb6.zip | |
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.
Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libwmf')
| -rw-r--r-- | media-libs/libwmf/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/libwmf/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild | 19 |
3 files changed, 26 insertions, 11 deletions
diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog index 11a5765d8969..3f9398b8d848 100644 --- a/media-libs/libwmf/ChangeLog +++ b/media-libs/libwmf/ChangeLog @@ -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 diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest index cea8b63b0c10..5378d3ceaa28 100644 --- a/media-libs/libwmf/Manifest +++ b/media-libs/libwmf/Manifest @@ -9,13 +9,13 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 RMD160 1a723c2e0d1dd16b6788f0ead2277e8996ab8 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 RMD160 28ff35be124c3070836e5d4e93772892b395931e SHA1 3936dda44d1d09e272346d9ae8d2fd9b90fe775e SHA256 b99aea69f5c83ccecaca0f74c7d5bbdac2bb7c6c7991bf30d8c64616edddc469 DIST libwmf-0.2.8.4.tar.gz 2169375 RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8 EBUILD libwmf-0.2.8.4-r3.ebuild 2726 RMD160 ad8ef0107be4257d80ea3ab439bd4a1d8d73f42a SHA1 086381cc2f53e3a221897b90d3d2fdacc6e47529 SHA256 e9701604e1774d87560ace7a9f30885f51c061ca878f368da49f35baad46b572 -EBUILD libwmf-0.2.8.4-r4.ebuild 2358 RMD160 57820e09ebbc418ca16de7076612be216a358b6b SHA1 75fe1bc837f00ddd95ee20546108493de80e25e0 SHA256 48fda389a52720adda43ab0cd96f032da1c12e8535342631ad287cdaca786704 -MISC ChangeLog 10676 RMD160 0b54708d1202015a5481bac67d36fccf544603f5 SHA1 5cdef4c4297f0fe7adddde08c79445dc676a4641 SHA256 976e370a5be5d36754de4ba1bfc71c62f4bfb68d5f98f95c818e807ada50478f +EBUILD libwmf-0.2.8.4-r4.ebuild 2456 RMD160 82f39fcf7d6480c2769b10729d49da0bb09592ae SHA1 d93a9ab9918d994f0a99813833a39dbc851a5615 SHA256 c4c5bb85a9ff966e63cb870f7abaeec72ca09df3e5fd3ede16037e0e9197fad4 +MISC ChangeLog 10933 RMD160 2eec5a46eca281c360db1ed1344d48951d6395a6 SHA1 d69f5b49684896b98568359bb551d332431856b9 SHA256 74ab24164bbe904206f27e753def3234c6bc09582b19f9fd3bab0eb5b952a62c MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4i9HUACgkQkKaRLQcq0GIdGgCfY0yP+k4XZa2NYvhot/Z5ZL4G -ZJYAn3kY5Mpt6yM8/mZLi/DXkTm/FIKD -=eUAn +iEYEARECAAYFAk4jNqUACgkQHB6c3gNBRYfLswCfZJVRXC4/htrxSJ8iG70nss/9 +nN8AoMysAOxZhIqC13WW7CL+sqUqB4i7 +=uHSw -----END PGP SIGNATURE----- diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild index 5c89a2f74676..c4a88f8a60b7 100644 --- a/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild +++ b/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild @@ -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 @@ RDEPEND="app-text/ghostscript-gpl 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 @@ DEPEND="${RDEPEND} )" # 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_prepare() { } 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 \ |