diff options
| author |   Markus Meier <maekke@gentoo.org> | 2008-11-16 22:30:33 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2008-11-16 22:30:33 +0000 |
| commit | 369da25a8ccdc4df938a180a5f8538846d83c634 (patch) | |
| tree | 6cfe137757de02c68c5e45bfc62be6fd2f5a8be7 /media-gfx/imagemagick | |
| parent | Cleanup (diff) | |
| download | historical-369da25a8ccdc4df938a180a5f8538846d83c634.tar.gz historical-369da25a8ccdc4df938a180a5f8538846d83c634.tar.bz2 historical-369da25a8ccdc4df938a180a5f8538846d83c634.zip | |
old
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4-git4 i686
Diffstat (limited to 'media-gfx/imagemagick')
16 files changed, 19 insertions, 821 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index db4fa98de6aa..a365c9ef50fe 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.314 2008/11/16 21:21:47 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.315 2008/11/16 22:30:32 maekke Exp $ + + 16 Nov 2008; Markus Meier <maekke@gentoo.org> + -files/imagemagick-6.3.0.5-configure-windows-fonts.patch, + -files/imagemagick-6.3.0.5-docs.patch, + -files/imagemagick-6.3.0.5-no-lMagick.patch, + -files/imagemagick-6.3.0.5-parallel-build.patch, + -files/imagemagick-6.3.7.9-doc.patch, + -files/imagemagick-6.3.8.3-hpgl.patch, + -files/imagemagick-6.3.9.8-hpgl.patch, + -files/imagemagick-6.4.2.9-jbig.patch, + -files/imagemagick-6.4.3.5-svg-dep.patch, -files/imagemagick-perl.patch, + -imagemagick-6.3.8.3-r1.ebuild, -imagemagick-6.4.2.0.ebuild, + -imagemagick-6.4.2.9.ebuild, -imagemagick-6.4.3.5.ebuild: + old *imagemagick-6.4.5.7-r1 (16 Nov 2008) *imagemagick-6.4.5.7 (16 Nov 2008) diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 5b72b96606f3..e8e1628fe64e 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,45 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX imagemagick-6.3.0.5-configure-windows-fonts.patch 584 RMD160 363bf343b3b4deaa9772c0a2b3d79f618c36a14f SHA1 db467ddc0c056425c790eafe5c6a72d6a8a0cd98 SHA256 47b8831abce2295ddcb51965e8759f32ef1d6f910e889f059dfcc6312ec09604 -AUX imagemagick-6.3.0.5-docs.patch 528 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 SHA1 4a8c1122849a2362786cc3cbf165e57a123ade4c SHA256 97885116857d5bf64f7217852be42f04d42366a9e7235c6b7bd13201ca23abb5 -AUX imagemagick-6.3.0.5-no-lMagick.patch 685 RMD160 01693f7d6074391848e2a536d077044f9adaef59 SHA1 40b837f853d3853f58949991262c010aa091ecb8 SHA256 09bbaa9ed82ba495392b8f2aad1dd28542f3b1b1d8bc7cf4dd75f936b042ca9a -AUX imagemagick-6.3.0.5-parallel-build.patch 436 RMD160 68ede460a0aee676fa6f3a0dd7f90235bcf09f6a SHA1 14b19aa92d86be6db4fad68f13530f415c03fbdf SHA256 95958bf107327f7f1d598f4ca9357a2f0bb31464754865e611c4b754e2b72990 AUX imagemagick-6.3.3-docs.patch 605 RMD160 5efee8976d9bab8308fdb7d167ab85f5e9247026 SHA1 5b989f21e4b2295541b64abb86869761b4a41b67 SHA256 e08792995e61887cdbac5b1ab9f31500840d5be6e73164be02e1ad5412bce602 -AUX imagemagick-6.3.7.9-doc.patch 660 RMD160 cdd9e744d4708a2254c3949ee9fed20845c93b91 SHA1 0b42f37ac3ba822908056563d3bb35e0c0429906 SHA256 fbd73289353c0dca7a621b85664c84aa14fb9a758f59f669731f9cb412207e8f -AUX imagemagick-6.3.8.3-hpgl.patch 1852 RMD160 b6a2b0d1ceacf58a41723e95683aaaee3c050df5 SHA1 05c916506e750811ed76a31542563ac00e3c66f2 SHA256 44321e3a899345d21144e6b4715aba024daf3ccffa96187465eccf74886b6711 -AUX imagemagick-6.3.9.8-hpgl.patch 1852 RMD160 fae8922c63f1c31786c6bbe629e80e399983c644 SHA1 5bfc687e4fc3d6c1621df9d3e292b687b21524df SHA256 18c4ccca1da491e5c496e489065c774287171ed1ee9c531610a1d770acd5543e -AUX imagemagick-6.4.2.9-jbig.patch 877 RMD160 e7d9c5867d7ef07a1dd3811bcec873fbe2d078fb SHA1 88134e437698f4fbc21514381eb86e2bf8a14477 SHA256 bc3e8888f7418d2ad5b00f861a610eff62ed76b3b11009f4f5315b7666e1e11b -AUX imagemagick-6.4.3.5-svg-dep.patch 827 RMD160 6bf56908c52781da623022a950858aa29fc1692f SHA1 2c968ef1f4444536d53c41a73581dcb618f1de0d SHA256 60238f1f0bef3f2a9cda7b9d1db0bc724a84264f3ec193afc74ad51863f90dad -AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad DIST ImageMagick-6.3.3-8.tar.bz2 5633820 RMD160 fe9ad987909ae1364257de54463ff1f06240f8c8 SHA1 3a8593f0b5e5458647b3bc954e477eb925672f67 SHA256 e2b557f971fa5875647ad4c848025a095eb5784a4296d884ff162212eab8db4e DIST ImageMagick-6.3.4-4.tar.bz2 5796376 RMD160 519126459cd80e4c07f23aa21147d579fa4b7789 SHA1 117fd8552961149992c78c045d7de191f7692bb8 SHA256 bcaac2d9d416c055642b4f92b2c8057e5fed4f8d70703e423ad19b3662b096c3 DIST ImageMagick-6.3.5-10.tar.bz2 7571418 RMD160 b8436a7a5ada2793177f47621d031c89753b770c SHA1 f2fb1b73895a335c553c40b705af7ea179700316 SHA256 a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84 -DIST ImageMagick-6.3.8-3.tar.bz2 8792547 RMD160 31e8c34c654f207d8f1a216ed6184530aad8c96d SHA1 6a9ff40bf6f8812216298b2fad79c55d8900479b SHA256 d5df4328a660c94613a9587fd7386e13a00d5c4e115fd86b94205d21bdc33f8b DIST ImageMagick-6.4.0-6.tar.bz2 8826474 RMD160 19abac0458df07c5b90a131e3ca011f05104f8f4 SHA1 891128e03ea4d024d77794c91f6a1bcfa855058c SHA256 fa3763f1df89ef9be7416f9cd08f85d02a0240abb3f0bf21122d04e8b87d5bb1 -DIST ImageMagick-6.4.2-0.tar.bz2 8842016 RMD160 a0b074ec66c4d6149b3aa392cf4b0cbc6a6ea35e SHA1 a8fcb4839b124e2a900db6babdc307bf6695b8f1 SHA256 b427d83c223243760b7d9ccb1d926a9ce9a4e38d5eec262a713da7986a80cf91 -DIST ImageMagick-6.4.2-9.tar.bz2 8854437 RMD160 05fe1b04be7969d8531c4e2aecddc7606a28f43a SHA1 e68b6969c1cb2d455a705f80f1a4e94a2f6a6434 SHA256 fed24b4ea21af103624538211860ccd222eb6572cbbde3753ad1c6e8d3a0f6ea -DIST ImageMagick-6.4.3-5.tar.bz2 8858249 RMD160 a8e8c0582994e43cfe39cffce417c7237a5a4eb9 SHA1 035ed34f32a56b45b48262e3cdbb49d0aaaaf892 SHA256 8c20b5282af6469375b401f7104635a8a11bc73e67e331199627b61fa7d8bae1 DIST ImageMagick-6.4.4-6.tar.bz2 8856594 RMD160 e64f485d54118d6c99df392001645da213e2756b SHA1 703b0e5017fcffd4f6dca4f607862e984d8b5d1a SHA256 9c85e5c43adce21588fc0eaa526fa514797d985760cd302b904e27112e01da91 DIST ImageMagick-6.4.5-7.tar.bz2 8889574 RMD160 e519b19e1d584a62c911b5b1b57641bafcd732b5 SHA1 154ec72e118974f016f513eccf3e7bddd102dbbb SHA256 1e98ed76650263f84a3b827400dbdb1105f5d335c7a2782c5fbd83a971ab48ae EBUILD imagemagick-6.3.3.ebuild 2690 RMD160 78f27e2aea0e06ff092328d4082b6a6d0857270e SHA1 769b0d4df8008cf2992e5d2daa53b67db67af6d9 SHA256 a993f97c6064baf130c3183c60a26de325ab10ba409b5dff0af4203275103822 EBUILD imagemagick-6.3.4.ebuild 2699 RMD160 ec3ea0cfce3bb848a8bd5663594af3508d3959e9 SHA1 4c41e4cf194da3c3ee3c9c745d8b66cd03064cf1 SHA256 3ace432b149f986a33ec449dbb5f59187190b5d0a22d1192332ed45df3750f36 EBUILD imagemagick-6.3.5.10.ebuild 3049 RMD160 96173689b9fbe5113923e455bb5f49d821f34329 SHA1 9c0c8606abd5438ccaa9f6945870fc190a98f08d SHA256 02e17636b371ef56b3abefa9553b030c77760d29198840c59df7802e5e5be6aa -EBUILD imagemagick-6.3.8.3-r1.ebuild 3941 RMD160 39c44253826f6e1ba33be5d9770360fb88199e1e SHA1 1cca98a78ad875454005d6e6c5c391bed6e7cd00 SHA256 4f63862b953a7735edcf7275bcb7f6edb8d79ec6f482d00f26dbc70c2034627a EBUILD imagemagick-6.4.0.6.ebuild 3919 RMD160 6a493d4c07357433a518c78fbd853130a9d34b9d SHA1 d96f777bf2ab411ce001400163dde0fa06aa48ae SHA256 7e8c86b602c5db0cf3b5e041ef87299562c3e7d3460b67291e262338d7dee521 -EBUILD imagemagick-6.4.2.0.ebuild 4012 RMD160 d3ece0e1fc711f2db697a92404f43a9569271a10 SHA1 eeac6d941851735528d8e4d264e6b188357ccf92 SHA256 ebb34fb5553ebe0c0b430c159f1506d7e26f02fae0a645e249453fce58bf478d -EBUILD imagemagick-6.4.2.9.ebuild 4497 RMD160 2d2c910c9ce20a90279d26f48a2666fc7c3b4142 SHA1 cd1b763bb9c0201c1e1321ccdf5da724daee16e7 SHA256 707da8d66bfa5d58c668b9eb7d6d61ea80669d2f2fe0a09a65193399e9006312 -EBUILD imagemagick-6.4.3.5.ebuild 4461 RMD160 14417ca19bd27b3c2fd8e2f5219c25a11b141ea2 SHA1 c4a191214be5dfcca90e095218822d364c4f6da5 SHA256 4044d39cf555b202a02f9d46063adad1cd504e4b380db12b723ce83a3eb0d34a EBUILD imagemagick-6.4.4.6-r1.ebuild 4656 RMD160 885a8adc53e14e42d47f22273362ebe87a282ea3 SHA1 31b7cb0641fc1c357042737afab2a0da5f54358b SHA256 469708ce0c64400daa6de35f92a6497691bc6f2bd5caec642b515b2b55de95da EBUILD imagemagick-6.4.4.6.ebuild 4847 RMD160 7fd7893f13890cf677a416da5420e49d13eb5d1f SHA1 d44a5167e8de90c3758bd5d1a729b29a78e9f134 SHA256 67cc04300872ad780ee59c173c4d6c395ceea3145645e3d13639a2db5ebb9d6c EBUILD imagemagick-6.4.5.7-r1.ebuild 4656 RMD160 31b12f6e01b10b85e8b28eab363eaf8c780c4065 SHA1 0f91bf46cfc7acee54be70f945b7a6893c095639 SHA256 7f7ae665d7a45616221502ad339f76bcc8c96a2f8ea63c69767a8db9e181ca59 EBUILD imagemagick-6.4.5.7.ebuild 4864 RMD160 5923058317859725d891fcaf9475a58825e56c22 SHA1 273d140a9f0e7e1b4f24cb70b682b72896a81ca3 SHA256 810ee9f400047d65cd683eca7178f15b5a08279c9ee3362a79c5925e6a863da5 -MISC ChangeLog 47048 RMD160 bd3122bbb97ae767e1da312c432edcbc9d6ebd8a SHA1 2219ed709569b34c3c10c6da1467ab696d0d1156 SHA256 27c7cd713f75ff68aebfdf05f5052357c1d2d2099aac53bd7d8a814f9c1f4ed9 +MISC ChangeLog 47663 RMD160 9de562a9f71ba2c2e8ac94b7f3a30bf212e680e6 SHA1 29734ac77ba90f34fbbdf185eeeb7dcc14a7a18b SHA256 db2288eb7e17a1466583dcc01cd4b0d69cb53ce3d9acdc8f85a1830ca67e7c62 MISC metadata.xml 620 RMD160 facd588ff7e13cf1a573927c5f3e653f384bb4b2 SHA1 e989aa7d14e2a1c7382b5fdf1c395ed7dcf7d6cb SHA256 86955c079d63a4faacc4be59e01a4ce47934fc35f5b89f6accfdb755cd4ff2df -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkgjxcACgkQkKaRLQcq0GJhrACeI0p00cdTazBh/VX832kMGpNN -HjYAoILxsffR2OaOqdi97RhgvqhcR/SI -=6LZy +iEYEARECAAYFAkkgn0AACgkQkKaRLQcq0GKdWQCfYlpPzq0Gokx4cNGKJ3J1EEUK +zY8AnRgagaftGBKTaE2GvEulouptxlIw +=AsVw -----END PGP SIGNATURE----- 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 deleted file mode 100644 index 0857d866dfb8..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-configure-windows-fonts.patch +++ /dev/null @@ -1,19 +0,0 @@ - -From: Daniel Drake <d.drake@mmm.com> - -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/files/imagemagick-6.3.0.5-docs.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-docs.patch deleted file mode 100644 index 35cf26a91756..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-docs.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- configure.orig 2006-11-13 20:22:26.000000000 +0100 -+++ configure 2006-11-16 00:23:41.000000000 +0100 -@@ -43559,8 +43559,12 @@ - - # - # Path to ImageMagick document files -+if test "x${PF}" = "x" ; then - MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}" --MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}" -+else -+MagickDocumentSubdir="${PF}" -+fi -+MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}/html" - MagickDocumentPathDefine="${MagickDocumentPath}/" - if test "$native_win32_build" = 'yes' - then diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch deleted file mode 100644 index 4140ba617866..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- PerlMagick/Makefile.PL.in.orig 2006-09-19 10:53:54.000000000 -0400 -+++ PerlMagick/Makefile.PL.in 2007-02-15 08:39:41.000000000 -0500 -@@ -53,10 +53,10 @@ - 'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@", - - # Linker flags for building an executable -- 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}", -+ 'LDFLAGS' => "-L../magick/.libs $Config{'ldflags'}", - - # Linker flags for building a dynamically loadable module -- 'LDDLFLAGS' => "-L../magick/.libs -lMagick $Config{'lddlflags'}", -+ 'LDDLFLAGS' => "-L../magick/.libs $Config{'lddlflags'}", - - # Install PerlMagick binary into ImageMagick bin directory - 'INSTALLBIN' => '@BIN_DIR@', diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-parallel-build.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-parallel-build.patch deleted file mode 100644 index e0353b2492e6..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-parallel-build.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- PerlMagick/Makefile.am.orig 2007-02-28 01:10:33.000000000 +0100 -+++ PerlMagick/Makefile.am 2007-02-28 01:12:12.000000000 +0100 -@@ -41,7 +41,8 @@ - - if WITH_PERL_DYNAMIC - --$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) -+# add LIBMAGICK in deps to fix parallel make issue -+$(PERLMAKEFILE): perl-sources $(LIBMAGICK) $(PERLMAKEMAKER) - cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) - - install-exec-perl: $(PERLMAKEFILE) diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.7.9-doc.patch b/media-gfx/imagemagick/files/imagemagick-6.3.7.9-doc.patch deleted file mode 100644 index 5019579a2d5d..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.3.7.9-doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur ImageMagick-6.3.7-orig/configure ImageMagick-6.3.7/configure ---- ImageMagick-6.3.7-orig/configure 2008-01-21 00:51:35.000000000 +0100 -+++ ImageMagick-6.3.7/configure 2008-01-21 00:52:02.000000000 +0100 -@@ -40179,7 +40179,7 @@ - # - # Path to ImageMagick documentation files - DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" --DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}" -+DOCUMENTATION_PATH="/usr/share/doc/${PF}" - DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/" - if test "$native_win32_build" = 'yes'; then - DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1` diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.8.3-hpgl.patch b/media-gfx/imagemagick/files/imagemagick-6.3.8.3-hpgl.patch deleted file mode 100644 index 74cd240639e6..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.3.8.3-hpgl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru ImageMagick-6.3.8-orig/config/delegates.xml.in ImageMagick-6.3.8/config/delegates.xml.in ---- ImageMagick-6.3.8-orig/config/delegates.xml.in 2008-02-02 18:33:18.000000000 +0100 -+++ ImageMagick-6.3.8/config/delegates.xml.in 2008-02-02 18:33:45.000000000 +0100 -@@ -67,7 +67,7 @@ - <delegate decode="gplt" command=""@EchoDelegate@" "set size 1.25,0.62 set terminal postscript portrait color solid; set output "%o"; load "%i"" > "%u";"@GnuplotDecodeDelegate@" "%u""/> - <delegate decode="hdr" command=""@HDRDecodeDelegate@" "%i" "%o""/> - <delegate decode="hpg" command=""@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" mv -f `basename "%o"` "%o""/> -- <delegate decode="hpgl" command="if [ -e @HPGLDecodeDelegate@ -o -e /usr/bin/@HPGLDecodeDelegate@ ]; then @HPGLDecodeDelegate@ -q -m eps -f `basename "%o"` "%i" mv -f `basename "%o"` "%o else echo "You need to install hp2xx to use HPGL files with ImageMagick." exit 1 fi"/> -+ <delegate decode="hpgl" command="if [ -e @HPGLDecodeDelegate@ -o -e /usr/bin/@HPGLDecodeDelegate@ ]; then @HPGLDecodeDelegate@ -q -m eps -f `basename "%o"` "%i"; mv -f `basename "%o"` "%o"; else echo "You need to install hp2xx to use HPGL files with ImageMagick."; exit 1; fi"/> - <delegate decode="htm" command=""@HTMLDecodeDelegate@" -U -o "%o" "%i""/> - <delegate decode="html" command=""@HTMLDecodeDelegate@" -U -o "%o" "%i""/> - <delegate decode="https" command=""@WWWDecodeDelegate@" -s -k -o "%o" "https:%M""/> diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.9.8-hpgl.patch b/media-gfx/imagemagick/files/imagemagick-6.3.9.8-hpgl.patch deleted file mode 100644 index 07461b7950b0..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.3.9.8-hpgl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru ImageMagick-6.3.9.orig/config/delegates.xml.in ImageMagick-6.3.9/config/delegates.xml.in ---- ImageMagick-6.3.9.orig/config/delegates.xml.in 2008-03-16 18:16:10.000000000 +0100 -+++ ImageMagick-6.3.9/config/delegates.xml.in 2008-03-16 18:18:30.000000000 +0100 -@@ -67,7 +67,7 @@ - <delegate decode="gplt" command=""@EchoDelegate@" "set size 1.25,0.62 set terminal postscript portrait color solid; set output "%o"; load "%i"" > "%u";"@GnuplotDecodeDelegate@" "%u""/> - <delegate decode="hdr" command=""@HDRDecodeDelegate@" "%i" "%o""/> - <delegate decode="hpg" command=""@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" mv -f `basename "%o"` "%o""/> -- <delegate decode="hpgl" command="if [ -e @HPGLDecodeDelegate@ -o -e /usr/bin/@HPGLDecodeDelegate@ ]; then @HPGLDecodeDelegate@ -q -m eps -f `basename "%o"` "%i" mv -f `basename "%o"` "%o else echo "You need to install hp2xx to use HPGL files with ImageMagick." exit 1 fi"/> -+ <delegate decode="hpgl" command="if [ -e @HPGLDecodeDelegate@ -o -e /usr/bin/@HPGLDecodeDelegate@ ]; then @HPGLDecodeDelegate@ -q -m eps -f `basename "%o"` "%i"; mv -f `basename "%o"` "%o"; else echo "You need to install hp2xx to use HPGL files with ImageMagick."; exit 1; fi"/> - <delegate decode="htm" command=""@HTMLDecodeDelegate@" -U -o "%o" "%i""/> - <delegate decode="html" command=""@HTMLDecodeDelegate@" -U -o "%o" "%i""/> - <delegate decode="https" command=""@WWWDecodeDelegate@" -s -k -o "%o" "https:%M""/> diff --git a/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch b/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch deleted file mode 100644 index 2b30c79629b6..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- configure.ac.orig 2008-08-20 08:04:11 +0200 -+++ configure.ac 2008-08-20 08:05:08 +0200 -@@ -1795,6 +1795,11 @@ - # - # Check for JBIG delegate library. - # -+AC_ARG_WITH([jbig], -+ [AC_HELP_STRING([--without-jbig], -+ [disable JBIG support])], -+ [with_jbig=$withval], -+ [with_jbig='yes']) - have_jbig='no' - JBIG_LIBS='' - if test "$with_jbig" != 'no'; then ---- configure.orig 2008-08-20 08:12:56 +0200 -+++ configure 2008-08-20 08:15:05 +0200 -@@ -1261,6 +1261,7 @@ - with_fontpath - with_gs_font_dir - with_gvc -+with_jbig - with_jpeg - with_jp2 - with_lcms -@@ -37245,6 +37246,14 @@ - - - -+if test "${with_jbig+set}" = set; then -+ withval=$with_jbig; with_jbig=$withval -+else -+ with_jbig='yes' -+fi -+if test "$with_jbig" != 'yes'; then -+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jbig=$with_jbig " -+fi - - # - # Check for JBIG delegate library. diff --git a/media-gfx/imagemagick/files/imagemagick-6.4.3.5-svg-dep.patch b/media-gfx/imagemagick/files/imagemagick-6.4.3.5-svg-dep.patch deleted file mode 100644 index 2b6c401398fe..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.4.3.5-svg-dep.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru ImageMagick-6.4.3.orig/Makefile.in ImageMagick-6.4.3/Makefile.in ---- ImageMagick-6.4.3.orig/Makefile.in 2008-09-21 13:29:23.000000000 +0200 -+++ ImageMagick-6.4.3/Makefile.in 2008-09-21 13:30:39.000000000 +0200 -@@ -980,8 +980,8 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(coders_sun_la_LDFLAGS) $(LDFLAGS) -o $@ - @WITH_MODULES_TRUE@am_coders_sun_la_rpath = -rpath $(codersdir) --coders_svg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -+coders_svg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \ -+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - am_coders_svg_la_OBJECTS = coders/coders_svg_la-svg.lo - coders_svg_la_OBJECTS = $(am_coders_svg_la_OBJECTS) diff --git a/media-gfx/imagemagick/files/imagemagick-perl.patch b/media-gfx/imagemagick/files/imagemagick-perl.patch deleted file mode 100644 index 806af8b6261c..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-perl.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naurp ImageMagick-6.2.9.old/PerlMagick/Makefile.PL.in ImageMagick-6.2.9/PerlMagick/Makefile.PL.in ---- ImageMagick-6.2.9.old/PerlMagick/Makefile.PL.in 2006-09-07 21:28:34.000000000 -0400 -+++ ImageMagick-6.2.9/PerlMagick/Makefile.PL.in 2006-09-22 09:45:10.000000000 -0400 -@@ -53,17 +53,16 @@ WriteMakefile - 'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@", - - # Linker flags for building an executable -- 'LDFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}", -+ 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}", - - # Linker flags for building a dynamically loadable module -- 'LDDLFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}", -+ 'LDDLFLAGS' => "-L../magick/.libs -lMagick $Config{'lddlflags'}", - - # Install PerlMagick binary into ImageMagick bin directory - 'INSTALLBIN' => '@BIN_DIR@', - - # Library specification -- 'LIBS' => ['-lMagick @MAGICK_DEP_LIBS@'], -- -+ 'LIBS' => [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ], - # Perl binary name (if a Perl binary is built) - 'MAP_TARGET' => 'PerlMagick', - -diff -Naurp ImageMagick-6.2.9.old/PerlMagick/Makefile.am ImageMagick-6.2.9/PerlMagick/Makefile.am ---- ImageMagick-6.2.9.old/PerlMagick/Makefile.am 2005-04-20 12:27:36.000000000 -0400 -+++ ImageMagick-6.2.9/PerlMagick/Makefile.am 2006-09-22 09:44:09.000000000 -0400 -@@ -45,11 +45,10 @@ $(PERLMAKEFILE): perl-sources $(PERLMAKE - cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) - - install-exec-perl: $(PERLMAKEFILE) -- ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ -- $(MAKE) CC='@CC@' install && \ -- $(MAKE) clean && rm -f Makefile.old ) -+ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install - --all-perl: -+all-perl: $(PERLMAKEFILE) -+ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' - - uninstall-exec-perl: $(PERLMAKEFILE) - echo "Uninstall not supported for PerlMagick" diff --git a/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild deleted file mode 100644 index c27a7fc35fb1..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild,v 1.7 2008/04/11 20:49:50 maekke Exp $ - -inherit eutils multilib perl-app - -MY_PN=ImageMagick -MY_P=${MY_PN}-${PV%.*} -MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.} - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="http://www.imagemagick.org/" -SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" - -LICENSE="imagemagick" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx - openexr perl png q8 q32 svg tiff truetype X wmf xml zlib" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - djvu? ( app-text/djvu ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( media-libs/libfpx ) - graphviz? ( >=media-gfx/graphviz-2.6 ) - gs? ( virtual/ghostscript ) - jbig? ( media-libs/jbigkit ) - jpeg? ( >=media-libs/jpeg-6b ) - jpeg2k? ( media-libs/jasper ) - lcms? ( >=media-libs/lcms-1.06 ) - openexr? ( media-libs/openexr ) - perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) - png? ( media-libs/libpng ) - tiff? ( >=media-libs/tiff-3.5.5 ) - xml? ( >=dev-libs/libxml2-2.4.10 ) - truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXext - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - svg? ( >=gnome-base/librsvg-2.9.0 ) - ) - !dev-perl/perlmagick - !sys-apps/compare" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - >=sys-devel/libtool-1.5.2-r6 - X? ( x11-proto/xextproto )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use djvu && ! built_with_use app-text/djvu threads; then - eerror "app-text/djvu has to be built with threads support." - die "build app-text/djvu with USE=\"threads\"" - fi - # for now, only build svg support when X is enabled, as librsvg - # pulls in quite some X dependencies. - if use svg && ! use X ; then - elog "the svg USE-flag requires the X USE-flag set." - elog "disabling svg support for now." - fi -} - -src_unpack() { - unpack ${A} - - # fix doc dir, bug 91911 - sed -i -e \ - 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \ - "${S}"/configure || die - - # bug 206925 - epatch "${FILESDIR}"/${P}-hpgl.patch -} - -src_compile() { - local myconf - if use q32 ; then - myconf="${myconf} --with-quantum-depth=32" - elif use q8 ; then - myconf="${myconf} --with-quantum-depth=8" - else - myconf="${myconf} --with-quantum-depth=16" - fi - - if use X && use svg ; then - myconf="${myconf} --with-rsvg" - else - myconf="${myconf} --without-rsvg" - fi - - econf \ - ${myconf} \ - --with-ltdl-include=/usr/include \ - --with-ltdl-lib=/usr/$(get_libdir) \ - --with-threads \ - --with-modules \ - $(use_with perl) \ - --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ - $(use_enable hdri) \ - $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ - $(use_with !nocxx magick-plus-plus) \ - $(use_with bzip2 bzlib) \ - $(use_with djvu) \ - $(use_with fontconfig) \ - $(use_with fpx) \ - $(use_with gs dps) \ - $(use_with gs gslib) \ - $(use_with graphviz gvc) \ - $(use_with jbig) \ - $(use_with jpeg jpeg) \ - $(use_with jpeg2k jp2) \ - $(use_with lcms) \ - $(use_with png) \ - $(use_with svg rsvg) \ - $(use_with tiff) \ - $(use_with truetype freetype) \ - $(use_with wmf) \ - $(use_with xml) \ - $(use_with zlib) \ - $(use_with X x) \ - $(use_with openexr) \ - || die "econf failed" - emake || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation of files into image failed" - - # dont need these files with runtime plugins - rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a} - - use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html} - dodoc NEWS ChangeLog AUTHORS README.txt - - # Fix perllocal.pod file collision - use perl && fixlocalpod -} diff --git a/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild b/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild deleted file mode 100644 index beed57c11b79..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.0.ebuild,v 1.4 2008/08/16 12:25:03 maekke Exp $ - -inherit eutils multilib perl-app - -MY_PN=ImageMagick -MY_P=${MY_PN}-${PV%.*} -MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.} - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="http://www.imagemagick.org/" -SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" - -LICENSE="imagemagick" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx - openexr perl png q8 q32 svg tiff truetype X wmf xml zlib" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - djvu? ( app-text/djvu ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( media-libs/libfpx ) - graphviz? ( >=media-gfx/graphviz-2.6 ) - gs? ( virtual/ghostscript ) - jbig? ( media-libs/jbigkit ) - jpeg? ( >=media-libs/jpeg-6b ) - jpeg2k? ( media-libs/jasper ) - lcms? ( >=media-libs/lcms-1.06 ) - openexr? ( media-libs/openexr ) - perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) - png? ( media-libs/libpng ) - tiff? ( >=media-libs/tiff-3.5.5 ) - xml? ( >=dev-libs/libxml2-2.4.10 ) - truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXext - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - svg? ( >=gnome-base/librsvg-2.9.0 ) - ) - !dev-perl/perlmagick - !sys-apps/compare - >=sys-devel/libtool-1.5.2-r6" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - X? ( x11-proto/xextproto )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use djvu && ! built_with_use app-text/djvu threads; then - eerror "app-text/djvu has to be built with threads support." - die "build app-text/djvu with USE=\"threads\"" - fi - # for now, only build svg support when X is enabled, as librsvg - # pulls in quite some X dependencies. - if use svg && ! use X ; then - elog "the svg USE-flag requires the X USE-flag set." - elog "disabling svg support for now." - fi -} - -src_unpack() { - unpack ${A} - - # fix doc dir, bug 91911 - sed -i -e \ - 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \ - "${S}"/configure || die - -} - -src_compile() { - local myconf - if use q32 ; then - myconf="${myconf} --with-quantum-depth=32" - elif use q8 ; then - myconf="${myconf} --with-quantum-depth=8" - else - myconf="${myconf} --with-quantum-depth=16" - fi - - if use X && use svg ; then - myconf="${myconf} --with-rsvg" - else - myconf="${myconf} --without-rsvg" - fi - - econf \ - ${myconf} \ - --without-included-ltdl \ - --with-ltdl-include=/usr/include \ - --with-ltdl-lib=/usr/$(get_libdir) \ - --with-threads \ - --with-modules \ - --disable-openmp \ - $(use_with perl) \ - --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ - $(use_enable hdri) \ - $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ - $(use_with !nocxx magick-plus-plus) \ - $(use_with bzip2 bzlib) \ - $(use_with djvu) \ - $(use_with fontconfig) \ - $(use_with fpx) \ - $(use_with gs dps) \ - $(use_with gs gslib) \ - $(use_with graphviz gvc) \ - $(use_with jbig) \ - $(use_with jpeg jpeg) \ - $(use_with jpeg2k jp2) \ - $(use_with lcms) \ - $(use_with png) \ - $(use_with svg rsvg) \ - $(use_with tiff) \ - $(use_with truetype freetype) \ - $(use_with wmf) \ - $(use_with xml) \ - $(use_with zlib) \ - $(use_with X x) \ - $(use_with openexr) \ - || die "econf failed" - # parallel-building broken in this version, bug #232638 - emake -j1 || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation of files into image failed" - - # dont need these files with runtime plugins - rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a} - - use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html} - dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt - - # Fix perllocal.pod file collision - use perl && fixlocalpod -} diff --git a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild deleted file mode 100644 index 20d5d1b709a5..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild,v 1.6 2008/08/21 15:23:20 grobian Exp $ - -inherit eutils multilib perl-app toolchain-funcs - -MY_PN=ImageMagick -MY_P=${MY_PN}-${PV%.*} -MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.} - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="http://www.imagemagick.org/" -SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" - -LICENSE="imagemagick" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx - openexr openmp perl png q8 q32 svg tiff truetype X wmf xml zlib" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - djvu? ( app-text/djvu ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( media-libs/libfpx ) - graphviz? ( >=media-gfx/graphviz-2.6 ) - gs? ( virtual/ghostscript ) - jbig? ( media-libs/jbigkit ) - jpeg? ( >=media-libs/jpeg-6b ) - jpeg2k? ( media-libs/jasper ) - lcms? ( >=media-libs/lcms-1.06 ) - openexr? ( media-libs/openexr ) - perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) - png? ( media-libs/libpng ) - tiff? ( >=media-libs/tiff-3.5.5 ) - xml? ( >=dev-libs/libxml2-2.4.10 ) - truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXext - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - svg? ( >=gnome-base/librsvg-2.9.0 ) - ) - !dev-perl/perlmagick - !sys-apps/compare - >=sys-devel/libtool-1.5.2-r6" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - X? ( x11-proto/xextproto )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use djvu && ! built_with_use app-text/djvu threads; then - eerror "app-text/djvu has to be built with threads support." - die "build app-text/djvu with USE=\"threads\"" - fi - # for now, only build svg support when X is enabled, as librsvg - # pulls in quite some X dependencies. - if use svg && ! use X ; then - elog "the svg USE-flag requires the X USE-flag set." - elog "disabling svg support for now." - fi -} - -src_unpack() { - unpack ${A} - - # fix doc dir, bug 91911 - sed -i -e \ - 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \ - "${S}"/configure || die - - cd "${S}" - epatch "${FILESDIR}"/${P}-jbig.patch -} - -src_compile() { - local myconf - if use q32 ; then - myconf="${myconf} --with-quantum-depth=32" - elif use q8 ; then - myconf="${myconf} --with-quantum-depth=8" - else - myconf="${myconf} --with-quantum-depth=16" - fi - - if use X && use svg ; then - myconf="${myconf} --with-rsvg" - else - myconf="${myconf} --without-rsvg" - fi - - #openmp support only works with >=sys-devel/gcc-4.3 - # see bug #223825 - if use openmp && built_with_use --missing false sys-devel/gcc openmp; then - if [[ $(gcc-version) != "4.3" ]] ; then - ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling." - myconf="${myconf} --disable-openmp" - else - myconf="${myconf} --enable-openmp" - fi - else - elog "disabling openmp support" - myconf="${myconf} --disable-openmp" - fi - - econf \ - ${myconf} \ - --without-included-ltdl \ - --with-ltdl-include=/usr/include \ - --with-ltdl-lib=/usr/$(get_libdir) \ - --with-threads \ - --with-modules \ - $(use_with perl) \ - --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ - $(use_enable hdri) \ - $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ - $(use_with !nocxx magick-plus-plus) \ - $(use_with bzip2 bzlib) \ - $(use_with djvu) \ - $(use_with fontconfig) \ - $(use_with fpx) \ - $(use_with gs dps) \ - $(use_with gs gslib) \ - $(use_with graphviz gvc) \ - $(use_with jbig) \ - $(use_with jpeg jpeg) \ - $(use_with jpeg2k jp2) \ - $(use_with lcms) \ - $(use_with png) \ - $(use_with svg rsvg) \ - $(use_with tiff) \ - $(use_with truetype freetype) \ - $(use_with wmf) \ - $(use_with xml) \ - $(use_with zlib) \ - $(use_with X x) \ - $(use_with openexr) \ - || die "econf failed" - # parallel-building broken in this version, bug #232638 - emake || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation of files into image failed" - - # dont need these files with runtime plugins - rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a} - - use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html} - dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt - - # Fix perllocal.pod file collision - use perl && fixlocalpod -} diff --git a/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild b/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild deleted file mode 100644 index aa3a7b280970..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild,v 1.2 2008/09/22 16:58:13 maekke Exp $ - -inherit eutils multilib perl-app toolchain-funcs - -MY_PN=ImageMagick -MY_P=${MY_PN}-${PV%.*} -MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.} - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="http://www.imagemagick.org/" -SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" - -LICENSE="imagemagick" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx - openexr openmp perl png q8 q32 svg tiff truetype X wmf xml zlib" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - djvu? ( app-text/djvu ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( media-libs/libfpx ) - graphviz? ( >=media-gfx/graphviz-2.6 ) - gs? ( virtual/ghostscript ) - jbig? ( media-libs/jbigkit ) - jpeg? ( >=media-libs/jpeg-6b ) - jpeg2k? ( media-libs/jasper ) - lcms? ( >=media-libs/lcms-1.06 ) - openexr? ( media-libs/openexr ) - perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) - png? ( media-libs/libpng ) - tiff? ( >=media-libs/tiff-3.5.5 ) - xml? ( >=dev-libs/libxml2-2.4.10 ) - truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXext - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - svg? ( >=gnome-base/librsvg-2.9.0 ) - ) - !dev-perl/perlmagick - !sys-apps/compare - >=sys-devel/libtool-1.5.2-r6" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - X? ( x11-proto/xextproto )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use djvu && ! built_with_use app-text/djvu threads; then - eerror "app-text/djvu has to be built with threads support." - die "build app-text/djvu with USE=\"threads\"" - fi - # for now, only build svg support when X is enabled, as librsvg - # pulls in quite some X dependencies. - if use svg && ! use X ; then - elog "the svg USE-flag requires the X USE-flag set." - elog "disabling svg support for now." - fi -} - -src_unpack() { - unpack ${A} - - # fix doc dir, bug 91911 - sed -i -e \ - 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \ - "${S}"/configure || die - - cd "${S}" - # for bug #236643 - epatch "${FILESDIR}"/${P}-svg-dep.patch -} - -src_compile() { - local myconf - if use q32 ; then - myconf="${myconf} --with-quantum-depth=32" - elif use q8 ; then - myconf="${myconf} --with-quantum-depth=8" - else - myconf="${myconf} --with-quantum-depth=16" - fi - - if use X && use svg ; then - myconf="${myconf} --with-rsvg" - else - myconf="${myconf} --without-rsvg" - fi - - #openmp support only works with >=sys-devel/gcc-4.3 - # see bug #223825 - if use openmp && built_with_use --missing false sys-devel/gcc openmp; then - if [[ $(gcc-version) != "4.3" ]] ; then - ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling." - myconf="${myconf} --disable-openmp" - else - myconf="${myconf} --enable-openmp" - fi - else - elog "disabling openmp support" - myconf="${myconf} --disable-openmp" - fi - - econf \ - ${myconf} \ - --without-included-ltdl \ - --with-ltdl-include=/usr/include \ - --with-ltdl-lib=/usr/$(get_libdir) \ - --with-threads \ - --with-modules \ - $(use_with perl) \ - --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ - $(use_enable hdri) \ - $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ - $(use_with !nocxx magick-plus-plus) \ - $(use_with bzip2 bzlib) \ - $(use_with djvu) \ - $(use_with fontconfig) \ - $(use_with fpx) \ - $(use_with gs dps) \ - $(use_with gs gslib) \ - $(use_with graphviz gvc) \ - $(use_with jbig) \ - $(use_with jpeg jpeg) \ - $(use_with jpeg2k jp2) \ - $(use_with lcms) \ - $(use_with png) \ - $(use_with svg rsvg) \ - $(use_with tiff) \ - $(use_with truetype freetype) \ - $(use_with wmf) \ - $(use_with xml) \ - $(use_with zlib) \ - $(use_with X x) \ - $(use_with openexr) \ - || die "econf failed" - emake || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation of files into image failed" - - # dont need these files with runtime plugins - rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a} - - use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html} - dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt - - # Fix perllocal.pod file collision - use perl && fixlocalpod -} |