From: Daniel Drake Date: Thu, 8 Feb 2007 16:01:46 +0000 (+0000) Subject: Make corefonts dependency conditional based on USE=truetype, bug #146713 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60f1df56bb802870d66251b95b525080d9bb6fce;p=gentoo.git Make corefonts dependency conditional based on USE=truetype, bug #146713 Package-Manager: portage-2.1.2-r9 --- diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index e18b4c2325e5..f9bc81a83cbe 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.211 2007/02/07 20:23:57 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.212 2007/02/08 16:01:46 dsd Exp $ + + 08 Feb 2007; Daniel Drake + -files/imagemagick-6.2.5.4-docs.patch, + +files/imagemagick-6.3.0.5-configure-windows-fonts.patch, + imagemagick-6.3.0.5.ebuild: + Make corefonts dependency conditional based on USE=truetype, bug #146713 07 Feb 2007; Karol Wojtaszek -imagemagick-6.2.9.5.ebuild, -imagemagick-6.2.9.5-r1.ebuild: diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 7fabebdf4d6b..b338b4bcefee 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,7 +1,7 @@ -AUX imagemagick-6.2.5.4-docs.patch 1025 RMD160 ff4d59b7c7b447fec55f981cd9f94f1f27cf6a06 SHA1 4f674ebc4554f7edc6c938f14360dc8a50881141 SHA256 c7ee14154f5a26c6b744bef518adcdba3a33797b29fdfa456f96c748886c6db2 -MD5 a2ea32f35ad5cd39b86e963c6af87076 files/imagemagick-6.2.5.4-docs.patch 1025 -RMD160 ff4d59b7c7b447fec55f981cd9f94f1f27cf6a06 files/imagemagick-6.2.5.4-docs.patch 1025 -SHA256 c7ee14154f5a26c6b744bef518adcdba3a33797b29fdfa456f96c748886c6db2 files/imagemagick-6.2.5.4-docs.patch 1025 +AUX imagemagick-6.3.0.5-configure-windows-fonts.patch 584 RMD160 363bf343b3b4deaa9772c0a2b3d79f618c36a14f SHA1 db467ddc0c056425c790eafe5c6a72d6a8a0cd98 SHA256 47b8831abce2295ddcb51965e8759f32ef1d6f910e889f059dfcc6312ec09604 +MD5 341f63fcb7d8052a356761cf6ae8d0d6 files/imagemagick-6.3.0.5-configure-windows-fonts.patch 584 +RMD160 363bf343b3b4deaa9772c0a2b3d79f618c36a14f files/imagemagick-6.3.0.5-configure-windows-fonts.patch 584 +SHA256 47b8831abce2295ddcb51965e8759f32ef1d6f910e889f059dfcc6312ec09604 files/imagemagick-6.3.0.5-configure-windows-fonts.patch 584 AUX imagemagick-6.3.0.5-docs.patch 528 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 SHA1 4a8c1122849a2362786cc3cbf165e57a123ade4c SHA256 97885116857d5bf64f7217852be42f04d42366a9e7235c6b7bd13201ca23abb5 MD5 e43f5cda62b2eda3e6a257b806b2386d files/imagemagick-6.3.0.5-docs.patch 528 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 files/imagemagick-6.3.0.5-docs.patch 528 @@ -11,14 +11,14 @@ MD5 d4ff8f64c60d78f04bac78748164f3fb files/imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 files/imagemagick-perl.patch 1864 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad files/imagemagick-perl.patch 1864 DIST ImageMagick-6.3.0-5.tar.bz2 5384739 RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e SHA1 c9f24810d2edc3d04886d32fe69a362c7415e79f SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30 -EBUILD imagemagick-6.3.0.5.ebuild 2790 RMD160 34fdf108d6db82e2675848bf6ea9a6b034b16323 SHA1 426a5ff1408d39307be52b4625dd72828b0fd22e SHA256 c280ac5e4bb30ab1f4915f5ff4c0a63a8e5af4ac1096b22d8bebd95427ad198a -MD5 5693f5056df919df786b3ef79d07d1a1 imagemagick-6.3.0.5.ebuild 2790 -RMD160 34fdf108d6db82e2675848bf6ea9a6b034b16323 imagemagick-6.3.0.5.ebuild 2790 -SHA256 c280ac5e4bb30ab1f4915f5ff4c0a63a8e5af4ac1096b22d8bebd95427ad198a imagemagick-6.3.0.5.ebuild 2790 -MISC ChangeLog 31560 RMD160 3d84c390788baa0d0bb6fefc3750cd015d14fec4 SHA1 d3b1385bfb35269cc5207b2526f72c720f8eb1bd SHA256 95c2af0233745de8d5c4c87e90e6bafa9dabc65d5d25f7413f2809175a829c5e -MD5 031d7e04f342d1b50270865f01bd5e6a ChangeLog 31560 -RMD160 3d84c390788baa0d0bb6fefc3750cd015d14fec4 ChangeLog 31560 -SHA256 95c2af0233745de8d5c4c87e90e6bafa9dabc65d5d25f7413f2809175a829c5e ChangeLog 31560 +EBUILD imagemagick-6.3.0.5.ebuild 2894 RMD160 e91ea08b798a4f267dbea95d9e118e418cd5a797 SHA1 b3912ca7e3752e88f687d5bd8510245ce2687037 SHA256 d0cd94007b7c0b879ee61b951d15320e0845c78c8cf581f34a7f4821f706513b +MD5 6dbf654cea436c7f5365388ff5a4f543 imagemagick-6.3.0.5.ebuild 2894 +RMD160 e91ea08b798a4f267dbea95d9e118e418cd5a797 imagemagick-6.3.0.5.ebuild 2894 +SHA256 d0cd94007b7c0b879ee61b951d15320e0845c78c8cf581f34a7f4821f706513b imagemagick-6.3.0.5.ebuild 2894 +MISC ChangeLog 31806 RMD160 4bbf42bc44b76f6e5e16eb14ace6994281748b6f SHA1 b1b2b08f66bdc9fa6cb0f1f39948fd641b0b3ddd SHA256 ba33df453850bc364a9c35b6247efc3b7461f20f06e5c0228aca6a9593306fea +MD5 406f682bb8944c3f80b905fcc0d04ae4 ChangeLog 31806 +RMD160 4bbf42bc44b76f6e5e16eb14ace6994281748b6f ChangeLog 31806 +SHA256 ba33df453850bc364a9c35b6247efc3b7461f20f06e5c0228aca6a9593306fea ChangeLog 31806 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224 diff --git a/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch b/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch deleted file mode 100644 index 9a28d80197ca..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch +++ /dev/null @@ -1,40 +0,0 @@ -Better control what doc files we install and where - ---- configure -+++ configure -@@ -45956,7 +45956,11 @@ - - # - # Path to ImageMagick document files -+if test "x${PF}" = "x" ; then - MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}" -+else -+MagickDocumentSubdir="${PF}" -+fi --MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}" -+MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}/html" - MagickDocumentPathDefine="${MagickDocumentPath}/" - if test "$native_win32_build" = 'yes' ---- Makefile.in -+++ Makefile.in -@@ -4532,10 +4532,7 @@ - - # Architecture independent data files installed in the package's data directory - docdir = $(MagickSharePath) --doc_DATA = \ -- LICENSE \ -- ChangeLog \ -- NEWS -+doc_DATA = - - @MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = magick-version # $(TXT2HTML_TARGETS) - -@@ -4547,7 +4544,7 @@ - # - - # Install HTML files --pkgdocdir = $(MagickDocumentPath) -+pkgdocdir = $(MagickDocumentPath)/html - DOCDIRS = images www www/api www/Magick++ - HTML_INSTALL_DATA_TARGETS = install-data-html - diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-configure-windows-fonts.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-configure-windows-fonts.patch new file mode 100644 index 000000000000..0857d866dfb8 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-configure-windows-fonts.patch @@ -0,0 +1,19 @@ + +From: Daniel Drake + +Handle --without-windows-font-dir as equivalent to --with-windows-font-dir= + +Index: ImageMagick-6.3.0/configure +=================================================================== +--- ImageMagick-6.3.0.orig/configure ++++ ImageMagick-6.3.0/configure +@@ -20544,6 +20544,9 @@ else + with_windows_font_dir='' + fi + ++if test "x$with_windows_font_dir" = "xno"; then ++ with_windows_font_dir= ++fi + if test "$with_windows_font_dir" != '' ; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-windows-font-dir==$with_windows_font_dir " + fi diff --git a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild index 23d440298c92..f81e20d1e844 100644 --- a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.9 2006/11/27 00:21:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.10 2007/02/08 16:01:46 dsd Exp $ inherit eutils multilib perl-app @@ -19,7 +19,6 @@ IUSE="bzip2 doc fpx graphviz gs jbig jpeg jpeg2k lcms mpeg nocxx perl png tiff t RDEPEND="bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) - media-fonts/corefonts X? ( x11-libs/libXext x11-libs/libXt @@ -32,7 +31,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 ) png? ( media-libs/libpng ) tiff? ( >=media-libs/tiff-3.5.5 ) xml? ( >=dev-libs/libxml2-2.4.10 ) - truetype? ( =media-libs/freetype-2* ) + truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) wmf? ( >=media-libs/libwmf-0.2.8 ) jbig? ( media-libs/jbigkit ) jpeg? ( >=media-libs/jpeg-6b ) @@ -56,6 +55,9 @@ src_unpack() { einfo ${S} epatch "${FILESDIR}"/${PN}-6.3.0.5-docs.patch # epatch "${FILESDIR}"/imagemagick-perl.patch + + # from bug #146713, sent upstream + epatch "${FILESDIR}"/${P}-configure-windows-fonts.patch } src_compile() { @@ -64,7 +66,7 @@ src_compile() { --with-modules \ $(use_with perl) \ --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ - --with-windows-font-dir=/usr/share/fonts/corefonts \ + $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ $(use_with !nocxx magick-plus-plus) \ $(use_with bzip2 bzlib) \ $(use_with fpx) \