From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- media-gfx/Manifest.gz | Bin 42054 -> 41900 bytes media-gfx/displaycal/Manifest | 2 + media-gfx/displaycal/displaycal-3.6.1.1.ebuild | 63 +++++ media-gfx/eog-plugins/Manifest | 2 + media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild | 64 +++++ media-gfx/eog/Manifest | 2 + media-gfx/eog/eog-3.26.2.ebuild | 56 +++++ media-gfx/exiv2/Manifest | 3 +- media-gfx/exiv2/exiv2-0.26_p20180319.ebuild | 3 +- .../files/exiv2-0.26_p20180319-clang-fix.patch | 47 ++++ media-gfx/freecad/Manifest | 6 - .../files/freecad-0.14.3702-install-paths.patch | 21 -- .../freecad/files/freecad-0.17_pre-no-webkit.patch | 45 ---- media-gfx/freecad/files/freecad.sharedmimeinfo | 8 - media-gfx/freecad/freecad-0.16.6712.ebuild | 131 ----------- media-gfx/freecad/metadata.xml | 12 - media-gfx/graphicsmagick/Manifest | 2 +- .../graphicsmagick/graphicsmagick-1.3.30.ebuild | 2 +- media-gfx/imagemagick/Manifest | 33 +-- .../files/imagemagick-7.0.26-FTBFS-on-i386.patch | 36 --- media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild | 186 --------------- media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild | 188 --------------- media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild | 188 --------------- media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild | 186 --------------- media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild | 2 +- media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild | 185 --------------- media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild | 185 --------------- media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild | 185 --------------- media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild | 185 --------------- media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild | 185 --------------- media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild | 185 --------------- media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild | 186 --------------- media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild | 188 --------------- media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild | 188 --------------- media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild | 186 --------------- media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild | 2 +- media-gfx/libimagequant/Manifest | 2 +- .../libimagequant/libimagequant-2.11.7.ebuild | 2 +- media-gfx/mypaint/Manifest | 1 + media-gfx/mypaint/mypaint-1.2.1-r2.ebuild | 78 ++++++ media-gfx/opentoonz/Manifest | 2 +- media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild | 92 ++++++++ media-gfx/opentoonz/opentoonz-1.2.1.ebuild | 94 -------- media-gfx/openvdb/Manifest | 14 +- .../files/openvdb-3.2.0-fix-build-system.patch | 262 --------------------- .../openvdb/files/openvdb-3.2.0-numpy-fix.patch | 17 -- .../files/openvdb-4.0.0-build-docs-once.patch | 32 --- .../files/openvdb-4.0.0-make-docs-optional.patch | 71 ------ .../files/openvdb-4.0.0-namespace-fixes.patch | 65 ----- ...envdb-4.0.0-python-module-install-dir-fix.patch | 16 -- .../files/openvdb-4.0.2-findboost-fix.patch | 11 + media-gfx/openvdb/metadata.xml | 5 - media-gfx/openvdb/openvdb-3.2.0.ebuild | 161 ------------- media-gfx/openvdb/openvdb-4.0.0.ebuild | 77 ------ media-gfx/openvdb/openvdb-4.0.2-r1.ebuild | 79 +++++++ 55 files changed, 513 insertions(+), 3716 deletions(-) create mode 100644 media-gfx/displaycal/displaycal-3.6.1.1.ebuild create mode 100644 media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild create mode 100644 media-gfx/eog/eog-3.26.2.ebuild create mode 100644 media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch delete mode 100644 media-gfx/freecad/Manifest delete mode 100644 media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch delete mode 100644 media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch delete mode 100644 media-gfx/freecad/files/freecad.sharedmimeinfo delete mode 100644 media-gfx/freecad/freecad-0.16.6712.ebuild delete mode 100644 media-gfx/freecad/metadata.xml delete mode 100644 media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild create mode 100644 media-gfx/mypaint/mypaint-1.2.1-r2.ebuild create mode 100644 media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild delete mode 100644 media-gfx/opentoonz/opentoonz-1.2.1.ebuild delete mode 100644 media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch delete mode 100644 media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch delete mode 100644 media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch delete mode 100644 media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch delete mode 100644 media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch delete mode 100644 media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch create mode 100644 media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch delete mode 100644 media-gfx/openvdb/openvdb-3.2.0.ebuild delete mode 100644 media-gfx/openvdb/openvdb-4.0.0.ebuild create mode 100644 media-gfx/openvdb/openvdb-4.0.2-r1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index cf42e560c390..ec5f6f30ff5b 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest index 8c6a2188e97c..5f357bdf6009 100644 --- a/media-gfx/displaycal/Manifest +++ b/media-gfx/displaycal/Manifest @@ -1,5 +1,7 @@ DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B a3eb968dcd0b5edbcf22a0ec84da55d8660ffa8782135a908db8ea7a6480ce7be9a59528d35a73b7eb57c9c0dd46996407ea3de834a85e6da1c5d006b8aa33b3 SHA512 ddb405c1d8b7bc5aefac80fb79edbb03c2a3b32821c8bbbdd6d095312fff57e8ffe5e53cc5b53c56fa32e6bcbc10cd76598441d750008c38a512ed1f62d7cd9c DIST DisplayCAL-3.6.0.0.tar.gz 10565171 BLAKE2B 394a925d28f513ededc1bc40b3ce7b5a2687a0c172006fd14b9081188e3ca80c0cd5f634ac84a9917d6aa301e083bffd05db622e292262f6d41db2a86c23a920 SHA512 6d0cff6344bb0dfcff58e88f93e2d0f7a3cf5f8e32b596f9f5e07b0e80ccb9b4ff429aa9fa63b5941f7622e0a7dcd227d0a1066e82d0843454f01d96dea97993 +DIST DisplayCAL-3.6.1.1.tar.gz 10433827 BLAKE2B 3e06ea90d820bcc96eb8de8d2fabf9d60997092e1529b3a0a6544bfd42f89380bb2525e27c075a3b8c55721d659b485188e8e7f2e872622ed9e6b6ebc87ac662 SHA512 03835117f53fb8c9d7cedfe67719b70878c3b62c20894a999c971d1d820dc7ec386ad68b8d4cf19496005abf2235e789526e6632b11d82f971f944b5f4dfdac6 EBUILD displaycal-3.5.3.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63 EBUILD displaycal-3.6.0.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63 +EBUILD displaycal-3.6.1.1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317 diff --git a/media-gfx/displaycal/displaycal-3.6.1.1.ebuild b/media-gfx/displaycal/displaycal-3.6.1.1.ebuild new file mode 100644 index 000000000000..72a722b64356 --- /dev/null +++ b/media-gfx/displaycal/displaycal-3.6.1.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 gnome2-utils xdg + +MY_PN="DisplayCAL" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Display calibration and characterization powered by Argyll CMS" +HOMEPAGE="https://displaycal.net/" +SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + >=media-gfx/argyllcms-1.1.0 + dev-python/wxpython:3.0 + >=x11-libs/libX11-1.3.3 + >=x11-apps/xrandr-1.3.2 + >=x11-libs/libXxf86vm-1.1.0 + >=x11-libs/libXinerama-1.1 +" +RDEPEND="${DEPEND} + >=dev-python/numpy-1.2.1 +" + +# Just in case someone renames the ebuild +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Do not generate udev/hotplug files + sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \ + -i DisplayCAL/setup.py || die + # Prohibit setup from running xdg-* programs, resulting to sandbox violation + sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \ + -e '/if which/s#xdg-desktop-menu#\0-non-existant#' \ + -i DisplayCAL/postinstall.py || die + + # Remove deprecated Encoding key from .desktop file + sed -e '/Encoding=UTF-8/d' -i misc/*.desktop || die + + # Remove x-world Media Type + sed -e 's/x\-world\/x\-vrml\;//g' \ + -i misc/displaycal-vrml-to-x3d-converter.desktop || die + + distutils-r1_src_prepare +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_icon_cache_update +} diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest index fd71cced0338..1cbb3deedf6b 100644 --- a/media-gfx/eog-plugins/Manifest +++ b/media-gfx/eog-plugins/Manifest @@ -1,3 +1,5 @@ DIST eog-plugins-3.16.6.tar.xz 398836 BLAKE2B fcd3c6dc61ca6d935580caffdf9c941d34265f8caa6cd3d682e0d7679888f6965f64ac30b807c00417e904b4e0eeff1a213a8f6d284c130abe265f9c97fc636b SHA512 e3bff786785ae36a41bc7c5fcb3cf75233595777409f373c4a6597fa6e432f72c7a75608e09ab66e1033ca0d12e3855346d7f7e0c571014b5aaef40184a3383b +DIST eog-plugins-3.26.3.tar.xz 470712 BLAKE2B cd5845481006b681555f35d1f353ed624baa83fc8fc45bb889b2418f31a776bf9e08e270f911f61f431123825a5b96fa684f72e378ddd0ad1107ff44a5c98519 SHA512 5ea0bbf692fa71fa77b0b78307cceee067c95e80c2e69e173990c1154df8014912f24f8d023eda79da56b7c1bdf0870e5e92b968a68c4961af3fc1382d4f468c EBUILD eog-plugins-3.16.6-r1.ebuild 1603 BLAKE2B f260b6b3e7f3f2710b5875bede7448dda4e717205d4abc03ff4f8d102cb3c3e6ad3d1d85108f2382f8b2aea984de910228b2b150c1cd7f9b9483264b3124c8d0 SHA512 46bbf6a0236ce8957d28beb82414c6c3bb6b7e7ae0411f1cf295e0aca0bc5296448076e1aec09f0d970217556fcbe0bdee635741db81f6eb4ef4d2423bf9cf51 +EBUILD eog-plugins-3.26.3.ebuild 1652 BLAKE2B 5c0cf60a96213a7e486362c5b7fa78d36617f6cc6b9bcdad2b1896a890ebd0fc70b8e2c4aeb94b87e187e7ca91317a08c7c96718ffca0c70ec0f26f1d329c11b SHA512 7e1631b5cbfc22acb3524ac3f3c4105d91d104aa28fa77d3bfc8930ccd24cdc23853b3edf2323438459cbd2537929248536c64de8b41d148a41d7902d4531e10 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild new file mode 100644 index 000000000000..93902b0bb3c4 --- /dev/null +++ b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{3_4,3_5,3_6} ) + +inherit gnome2 python-single-r1 + +DESCRIPTION="Eye of GNOME plugins" +HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="+exif map picasa +python" +REQUIRED_USE=" + map? ( exif ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + >=dev-libs/glib-2.38:2 + >=dev-libs/libpeas-0.7.4:= + >=media-gfx/eog-3.15.90 + >=x11-libs/gtk+-3.14:3 + exif? ( >=media-libs/libexif-0.6.16 ) + map? ( + media-libs/libchamplain:0.12[gtk] + >=media-libs/clutter-1.9.4:1.0 + >=media-libs/clutter-gtk-1.1.2:1.0 ) + picasa? ( >=dev-libs/libgdata-0.9.1:= ) + python? ( + ${PYTHON_DEPS} + >=dev-libs/glib-2.32:2[dbus] + dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + gnome-base/gsettings-desktop-schemas + media-gfx/eog[introspection] + x11-libs/gtk+:3[introspection] + x11-libs/pango[introspection] ) +" +# libxml2 required for glib-compile-resources +DEPEND="${RDEPEND} + dev-libs/libxml2:2 + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme" + use exif && plugins="${plugins},exif-display" + use map && plugins="${plugins},map" + use picasa && plugins="${plugins},postasa" + use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows" + gnome2_src_configure \ + $(use_enable python) \ + --with-plugins=${plugins} +} diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index 2477f3ddbb43..2eb401c114fd 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,3 +1,5 @@ DIST eog-3.24.1.tar.xz 4632496 BLAKE2B 24d6957285d5dae7fa2299165b1bac236e75dfa77938132c1d3f8f7312ed4a07d5d3a770fdbdbcf5ee1966a43b4443d331fbedec47575836e2170fa3022e657f SHA512 c007b6f2cd2b59747db72a5b86ecb34ac87fe0910a2d33df466eb05ebe5ff638fb9e57b15f2ea9328c95037334a2fd9010895241ff285628b7ed7b6d65912fb0 +DIST eog-3.26.2.tar.xz 5516240 BLAKE2B 5e63edd97c50e059af8d282d4596193fdb4e8a5767ebf9391c8c4f0b202136b1ef67c5d5d601e9863126b0db25e51927c4ac1fcb713fbd1a7ad21ccf207501af SHA512 40941d77739d1ed572dd7c4864435e5944c9dd48f5386b2ea11e16da52f7fa550844e4636ee35947172e921df596542d13928c79f7f511ef70ec92b832b1f1db EBUILD eog-3.24.1.ebuild 1343 BLAKE2B 63fa0d9614a37e9f3d40b2de61560a7642df4b14bb8196ff6de563b6afb5d0195f0832c27d41516659efbacadc977876b2ec09d736434d3026ddee8d913da0c2 SHA512 460f0f6c1e435cd970b0a67197d1885137c69d673eecd0e00dd5e7f9ebb8d52b2d22771b234786d3c31d175fcc24aad72314d0f0b14b11eea921b814fc725c50 +EBUILD eog-3.26.2.ebuild 1392 BLAKE2B ab4c6c3050f32db033e18892b4760207d5949ef5d160f7872554d234c8fe694ed90ce5d025363364485378ae1a6b80c6d2ec12fa4f582b78b707b30e6880ba08 SHA512 543ea9f99bef7802c2f1983f31f91125f5ece6f9eeee594ed0c050668557f1f9062623a99d0947af5a1ca39bcaa26d8fb736142804f95ffbeba357f808c71825 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26 diff --git a/media-gfx/eog/eog-3.26.2.ebuild b/media-gfx/eog/eog-3.26.2.ebuild new file mode 100644 index 000000000000..08ea37d31c23 --- /dev/null +++ b/media-gfx/eog/eog-3.26.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 + +DESCRIPTION="The Eye of GNOME image viewer" +HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome" + +LICENSE="GPL-2+" +SLOT="1" + +IUSE="debug +exif +introspection +jpeg lcms +svg tiff xmp" +REQUIRED_USE="exif? ( jpeg )" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +RDEPEND=" + >=dev-libs/glib-2.42.0:2[dbus] + >=dev-libs/libpeas-0.7.4:=[gtk] + >=gnome-base/gnome-desktop-2.91.2:3= + >=gnome-base/gsettings-desktop-schemas-2.91.92 + >=x11-libs/gtk+-3.22.0:3[introspection,X] + >=x11-misc/shared-mime-info-0.20 + + >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] + x11-libs/libX11 + + exif? ( >=media-libs/libexif-0.6.14 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + svg? ( >=gnome-base/librsvg-2.36.2:2 ) + xmp? ( media-libs/exempi:2 ) +" +# libxml2 required for glib-compile-resources +DEPEND="${RDEPEND} + dev-libs/libxml2:2 + >=dev-util/gtk-doc-am-1.16 + dev-util/itstool + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable introspection) \ + $(use_with jpeg libjpeg) \ + $(use_with exif libexif) \ + $(use_with lcms cms) \ + $(use_with xmp) \ + $(use_with svg librsvg) +} diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 6acdc4485177..726f4736cb1c 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -2,6 +2,7 @@ AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483 AUX exiv2-0.26_p20180319-CVE-2017-18005.patch 17451 BLAKE2B 8003fa352503d287f5f96572196cd67f4de8d90fda221588f77bdd2d053407f1e1dceba6aab317fc5a003aa5b6f0d99336f4a8e4fb21696b5d20b81a3d4af29f SHA512 94ed0a17a7ca9bd1155fc4c67ca67bf59dafedf5570cf4d7e59bda6f4b4c0749d98fd1c2d8929612a2fe5840565ce070acf21ac68d9d6882fe5c0a98ee18b343 AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b04cac24ac7b3a414e05d04a1e951cdbd3d90997756fa5c1dae5d2b193583e529a7eacc0cbb88d5c8345c3be76798d1897af7a7f250d SHA512 7506ccc0914dc78e369129efb0736638ee7a4ebf98d76feed0ce6a7c9d2885f5f7c984376df288f0694ec05654b89c39be42a989bcedd64d0fcecd6c605fe601 +AUX exiv2-0.26_p20180319-clang-fix.patch 1793 BLAKE2B 7312324ed80314e28dfdf4066247d64db89928cdf09b186b200efc071d5dd6630e3a22d7ed10f312ccbcace291f6e3a17fdce8bd42d4e094e6c07d85ee42d45b SHA512 54c96c831aabfaca93bfb2fee4b13a080be6bbad4b634890d26e42c6a069571277f75bbc517c0e212e99fc12add77d12fbaa0652e2a1506ac94e2e8c043901ed DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1 -EBUILD exiv2-0.26_p20180319.ebuild 3308 BLAKE2B 609ff16f1e63a841ffcbd72b5ecfb31f67c83c44dd1bc26807f68a312efe6d931dfd4390db7f61c10f0c27bfe8badd399e9f4131769aeb98b118124c1f292e92 SHA512 1d7b08a55cb9fd57f9d73ad7b72b59c851046109372c4575d260c703153cda44cf4f84ca08e58558b51deb73ad1736a7622f4306ff575abc73fb2cf682ab6d92 +EBUILD exiv2-0.26_p20180319.ebuild 3321 BLAKE2B 5a4bfe2aa47b7793ae10a39f428422c4aeed62805ab9b7f0c26a0af2c682968941ff9910c5d12eaf50093df593198e0b9bf8f22b194777ce3c79117b390cce81 SHA512 c4a200f82432e06727aef721384a994953ce3adadcfd315ad765927e75ec9f4422c31b98f6b7bd3c9660b31edd551a2c675f90d57d04491441ffb1524171422e MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild index 478ea7a79b15..eb2572dfcf35 100644 --- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild +++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild @@ -48,9 +48,10 @@ DOCS=( README doc/ChangeLog doc/cmd.txt ) S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}" PATCHES=( - # master, pending backports for 0.26 + # 0.26 branch "${FILESDIR}"/${P}-CVE-2018-4868.patch "${FILESDIR}"/${P}-CVE-2017-18005.patch + "${FILESDIR}"/${P}-clang-fix.patch # TODO: Take to upstream "${FILESDIR}"/${PN}-0.26-fix-docs.patch "${FILESDIR}"/${PN}-0.26-tools-optional.patch diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch new file mode 100644 index 000000000000..a80543a5ecd7 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch @@ -0,0 +1,47 @@ +From 176ba44cc31064183fdfbce55a7dd7e6b5e2a962 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Fri, 8 Jun 2018 23:46:04 +0200 +Subject: [PATCH] Fix C & C++ flag adding in CMakeLists.txt + +--- + CMakeLists.txt | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e179bf5..98a172ed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,21 +74,23 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") + + if( MINGW OR UNIX ) + if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) +- ADD_DEFINITIONS(-Wall +- -Wcast-align +- -Wpointer-arith +- -Wformat-security +- -Wmissing-format-attribute +- -Woverloaded-virtual +- -W +- ) ++ string(CONCAT WARNING_FLAGS " -Wall" ++ " -Wcast-align" ++ " -Wpointer-arith" ++ " -Wformat-security" ++ " -Wmissing-format-attribute" ++ " -Woverloaded-virtual" ++ " -W" ++ ) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") + ENDIF() + + message(STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}") + IF ( CYGWIN OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0)) +- ADD_DEFINITIONS( -std=gnu++98 ) # to support snprintf ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98" ) # to support snprintf + ELSE() +- ADD_DEFINITIONS( -std=c++98 ) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98" ) + ENDIF() + + ENDIF( MINGW OR UNIX ) \ No newline at end of file diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest deleted file mode 100644 index a385fd22987b..000000000000 --- a/media-gfx/freecad/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX freecad-0.14.3702-install-paths.patch 1143 BLAKE2B bbf14f29381fa7d808af53c51ce439ac21acb269648df647ddf3abc5ee6f01de44ffbc62bd1274aec1a167cf3f449c8498768af2af50fc0b9e3a5963f1857a46 SHA512 12181e4b48e4fb6284b574cb9872af713323d8f229a6c1746424968b0d22300bd6ada6437854a730dd4c5310eb36ebb06a35375ab012d36e9d3af4fb4271d884 -AUX freecad-0.17_pre-no-webkit.patch 1353 BLAKE2B c1a3b1cfea471cd027aaf921eabaaa036bda8fc5f6569358aa5990b1d400e0868429fb19c9d19013f93f8143a044961bf3e914a442f47a2ebbad0c0433819f78 SHA512 aa109102d428a7160538bbf53a05d335b44a8aca8bcdc3d43a258f2f30d1c8a4fb4f46021bc472ca3aa5c4fb3b26675222894b595c3e0e5a321cbfab348a928c -AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c -DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e -EBUILD freecad-0.16.6712.ebuild 3537 BLAKE2B 91c4bebaee48dbfbe209e36693616e8e70676c0e6e9e186cec582ee3ccbaa7ed54f6ce438bc1e498035e438e94f3cb3a18f1c5679da433b3fe9db899a984bf95 SHA512 80d0044bf5d12175353aedf8b05a3e9811013390fccc66cc071ae2c9564e7994e519ee86edc1456861654f57045b85b6ebbe54b36197af6d20414c69c721c991 -MISC metadata.xml 376 BLAKE2B a1e6c119bd4edce1e1e39c3ef95ed00c8d48f2b3391c2ead629b1936cf1570501de97988163b786669ef9d5cdea20d7ded01286dd1633278c703a5efd5813f0a SHA512 2b159882b18f33adc78ede30133528a915130d21fcfd111a099861b2ee719b59338cd81af63a289bb5812ce04dee238a6eb4596a95a5abedbc453f631e827f53 diff --git a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch b/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch deleted file mode 100644 index d042695e88c6..000000000000 --- a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- freecad-0.14.3702/CMakeLists.txt -+++ freecad-0.14.3702/CMakeLists.txt -@@ -69,9 +69,15 @@ - SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory") - endif(WIN32) - --SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") --SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") --SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+if(NOT CMAKE_INSTALL_DATADIR) -+ SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") -+endif(NOT CMAKE_INSTALL_DATADIR) -+if(NOT CMAKE_INSTALL_INCLUDEDIR) -+ SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") -+endif(NOT CMAKE_INSTALL_INCLUDEDIR) -+if(NOT CMAKE_INSTALL_DOCDIR) -+ SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+endif(NOT CMAKE_INSTALL_DOCDIR) - # Don't set it without manual adaption of LibDir variable in src/App/FreeCADInit.py - SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries") - diff --git a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch deleted file mode 100644 index 60dcfed22c7d..000000000000 --- a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: Remove Qt4-Webkit dependency -Author: Anton Gladky -Bug-Debian: https://bugs.debian.org/784464 -Last-Update: 2017-09-06 - -* asturm: tidied up and amended to use and not override BUILD_WEB - ---- a/src/Gui/DownloadManager.cpp -+++ b/src/Gui/DownloadManager.cpp -@@ -33,7 +33,6 @@ - #include - #include - #include --#include - - #include "DownloadItem.h" - #include "DownloadManager.h" -@@ -224,11 +223,12 @@ void DownloadManager::updateRow() - ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height()); - - bool remove = false; -+/* - QWebSettings *globalSettings = QWebSettings::globalSettings(); - if (!item->downloading() - && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) - remove = true; -- -+*/ - if (item->downloadedSuccessfully() - && removePolicy() == DownloadManager::SuccessFullDownload) { - remove = true; ---- a/CMakeLists.txt 2018-03-02 22:39:46.374140506 +0100 -+++ b/CMakeLists.txt 2018-03-02 22:41:59.904216932 +0100 -@@ -351,11 +351,6 @@ - set(BUILD_MESH ON) - endif(BUILD_JTREADER) - --#a runtime dependency --if(BUILD_START) -- set(BUILD_WEB ON) --endif(BUILD_START) -- - #leaving test module for someone else. - #image has none. as far as I can tell. - #mesh has none. as far as I can tell. diff --git a/media-gfx/freecad/files/freecad.sharedmimeinfo b/media-gfx/freecad/files/freecad.sharedmimeinfo deleted file mode 100644 index 6d5e93e7d13c..000000000000 --- a/media-gfx/freecad/files/freecad.sharedmimeinfo +++ /dev/null @@ -1,8 +0,0 @@ - - - - - FreeCAD document files - - - diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild b/media-gfx/freecad/freecad-0.16.6712.ebuild deleted file mode 100644 index 0c65c49697b2..000000000000 --- a/media-gfx/freecad/freecad-0.16.6712.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1 - -DESCRIPTION="Qt based Computer Aided Design application" -HOMEPAGE="https://www.freecadweb.org/" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git" -else - SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/eigen:3 - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-libs/xerces-c[icu] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/pyside:0[X,svg,${PYTHON_USEDEP}] - dev-python/shiboken:0[${PYTHON_USEDEP}] - dev-qt/designer:4 - dev-qt/qtgui:4[-egl] - dev-qt/qtopengl:4[-egl] - dev-qt/qtsvg:4 - media-libs/coin - media-libs/freetype - sci-libs/opencascade:*[vtk(+)] - sci-libs/orocos_kdl - sys-libs/zlib - virtual/glu" -RDEPEND="${COMMON_DEPEND} - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pivy[${PYTHON_USEDEP}] - dev-qt/assistant:4" -DEPEND="${COMMON_DEPEND} - >=dev-lang/swig-2.0.4-r1:0 - dev-python/pyside-tools:0[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch - "${FILESDIR}"/${PN}-0.17_pre-no-webkit.patch -) - -# https://bugs.gentoo.org/show_bug.cgi?id=352435 -# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt -RESTRICT="mirror" - -# TODO: -# DEPEND and RDEPEND: -# salome-smesh - science overlay -# zipio++ - not in portage yet - -S="${WORKDIR}/FreeCAD-${PV}" - -DOCS=( README.md ChangeLog.txt ) - -pkg_setup() { - fortran-2_pkg_setup - python-single-r1_pkg_setup - - [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade set or define otherwise" -} - -src_configure() { - export QT_SELECT=4 - - #-DOCC_* defined with cMake/FindOpenCasCade.cmake - #-DCOIN3D_* defined with cMake/FindCoin3D.cmake - #-DSOQT_ not used - local mycmakeargs=( - -DOCC_INCLUDE_DIR="${CASROOT}"/inc - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - -DCMAKE_INSTALL_DATADIR=share/${P} - -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=include/${P} - -DFREECAD_USE_EXTERNAL_KDL=ON - -DBUILD_WEB=OFF - ) - - # TODO to remove embedded dependencies: - # - # -DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++ - # (under src/zipios++) will be used - # salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version - # (external salomesmesh is available in "science" overlay) - - cmake-utils_src_configure - einfo "${P} will be built against opencascade version ${CASROOT}" -} - -src_install() { - cmake-utils_src_install - - make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;" - - # install mimetype for FreeCAD files - insinto /usr/share/mime/packages - newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml" - - # install icons to correct place rather than /usr/share/freecad - pushd "${ED%/}"/usr/share/${P} || die - local size - for size in 16 32 48 64; do - newicon -s ${size} freecad-icon-${size}.png freecad.png - done - doicon -s scalable freecad.svg - newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png - popd || die - - python_optimize "${ED%/}"/usr/{,share/${P}/}Mod/ -} - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml deleted file mode 100644 index fd959a35b4fb..000000000000 --- a/media-gfx/freecad/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - xmw@gentoo.org - Michael Weber - - - free-cad - FreeCAD/FreeCAD - - diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 7df3894a2842..5a2bc14b188f 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -6,6 +6,6 @@ DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24e DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a79165b5f915a1954595e15321992856474703efb49fdbce07c06f41a53ac9381e52356de171a204d456d1883428c5ed69 SHA512 1db593b2b9df429e57b33346c1b3fe83fee14d6902a1175b38e8e62aa58018ab6c3ad1fe58ec9b662324fe57b9163f0c55098d98724fd656dd159c5635559498 EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5 -EBUILD graphicsmagick-1.3.30.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5 +EBUILD graphicsmagick-1.3.30.ebuild 3256 BLAKE2B 4bed8642349e4e833b63423f0e805c52e726e0f566a7c3c5ba0be953394e38cca6894974603de533955c1d6be8a584cfcf1a8527b50e399bb2f3a8b5fb5738c9 SHA512 a2606ae0b22e81d6c22360a7ae4c377d0a55598171303f9ccbd857a7c1bc252e7b4e592896428aa40f65ca525bdfeced7e2a8d8f1f6d643dd4e05f9fdb2a41d6 EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5 MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild index c5f11fb693d3..4957382cb795 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" fi IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 91bc1c84cd29..af871f7ee236 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,35 +1,6 @@ -AUX imagemagick-7.0.26-FTBFS-on-i386.patch 1228 BLAKE2B 113d732c49e8341c9f9b7a9722ff561a9d37951a1278f6bc8a11af306016a798518f39d0ebfb5b85800dd211c9da3f60eebca4d7e5cd9f751ddf298d9dcc39db SHA512 f56936b02ed7fd3ce7d886df21980d7c1a6b9a9c92c4e3d46a4a33a7b30ff050c399d063595ba1efe62a56e2d3e5a6b36e901e96d7546b12db60fd18824fd164 -DIST ImageMagick-6.9.10-3.tar.xz 8922536 BLAKE2B 36936b28aac025bd948d9925707877b6f6b5a9eb50f1afc2f318a0596c9096b7853f4db44c42994fe32b7ba0fe42eafb9d705ead0faf6f75eb9e7e07bc1c97e4 SHA512 760e8b003415fcf6c83e542346800f1f2d8834cd47ba343eead1f0fa228f2f44af7ca9b4379de52498a3da76aa35f25d0ec939cefa71718400702bc6801fffbe -DIST ImageMagick-6.9.10-5.tar.xz 8921204 BLAKE2B b11c6dded5b42b797585e8253441fa6265de9f06241206b9ce29781df6c8896e9dd0ec967191ff28fcae445130d38e7e781728cbc27752b33b3422d971459952 SHA512 b6c068918a2c23bc86d84a1fd81bd8c0aea83fee0c33b5c686c7c6180231be2b27c1c43be111555017d2065fa97ba36c084e1479ff771846b73d500d67c7f85b -DIST ImageMagick-6.9.10-6.tar.xz 8913200 BLAKE2B 7009454e8d1d3bb27ef143dd3d0810df1548ff66d36cb48d0a91aee11246e2c2c4908947b95058b8cd2a83a4d69318564e4881a45636dca666fdec95e418c26a SHA512 984acc4610c205ead3b32ae4c059470dc4361e48cee6d9314bd3f8beed6b88b4adc824d59f059ead840293afae5595bdc3161e57ac9b2d4d49b90d32df46e49a -DIST ImageMagick-6.9.10-7.tar.xz 8916444 BLAKE2B 59211b1fe876226f53999706b7d992306f67687ab6170e3a1846e66806ef92b4eb2808eea8bcc69ffe7ad40bef36fcd4417124b784534d474647b413747dbb1e SHA512 3bda2478b79d9a35dd7b3dd1206d23e2b8ddb71a881e1d8f036fa3488d10245c11587ef7f8624febc758af65ce0d28d642d485deffc033e144f791977aac7beb DIST ImageMagick-6.9.10-8.tar.xz 8909952 BLAKE2B 0868759a5c6982c29d315bda69c1dec3b190fbea3757cf8e368b42976c9f35c4cd53610643e05e8872b0669768206559b2b726b494494f305b71dc2140d7d09c SHA512 63f131d4aa455e3f3a4a891359601d932aa6d43ff22fb9c6bed1a98a1a758da610db90cf951c131aaceabdbc8af0418d1a8e3752cabb39f95735ef18cd6745f2 -DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f -DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4 -DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5 -DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928 -DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08 -DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a -DIST ImageMagick-7.0.8-3.tar.xz 8613672 BLAKE2B c3ad7bb2d0917d2551b7c8ae0d80a8ab95e31d40cf18c26d7df363c3df209d7923a62a7fb90aec581fc4101139bc369a82289a96f51965f533b1956a9cfa4eed SHA512 0594de337c9eb1d116b15eeac0f1bceefeb86f13a41bc6721b120fa2e58f0ca5e2e1454b4e2b670c93545f13406f8bdbf54e5b3470e34841b5e9ac9d26821b70 -DIST ImageMagick-7.0.8-5.tar.xz 8611448 BLAKE2B 7a4f38ec458d010644d88cda605355d5871952b055ba9e088fe164448e2a0332e44e1545fc5929df455298ee56be65b66846faae4738912314177be050c683b0 SHA512 d760e630fd82b7636a031728e1f078efb8bb962e60cdc912cdfad29d3e6f74c1b5047941e711db89aa847d2e7c8c6ed44f451fa8ccff431c20d92ef49ef1915d -DIST ImageMagick-7.0.8-6.tar.xz 8636756 BLAKE2B de30cbf334e47232c4f2addc789342a96da72f13f1f88d0db08462cf8ad80487d78dfae51f23a63c83100f78a60beb79781c44cff1b25f084badbb009fedf965 SHA512 4d498d2b7e9345b71e08a541aeaa1ee0ee62c781e92638cdd38a9a830b8fa291afece032b731ee79e1142d26cf94817356f0492cef257039beac33f865e9f588 -DIST ImageMagick-7.0.8-7.tar.xz 8634788 BLAKE2B dbb5103f314d83b4318b2cfd6dcb5931e4c20c7a2c8b8f57c52b85ea8a46ca27733a4828203723f337acbc5fb4dc2ae446b789a6d2ca46ad8e2e0d0f7973fc29 SHA512 b1db005899b7c55c1794be1edfb0596989d8e4b4e521a1dadf28b837ba16b337587ac0a0a17c1c441a0085df56cfc3386d9f750fa83fd5ea8e3eb2d1398e58cd DIST ImageMagick-7.0.8-8.tar.xz 8639896 BLAKE2B 5971dbbee9726fab15e19e531bdbb50af710c67be84759030768958a33688b5492bb20758917c976dd9c08307031d041d5de7ae9a2326fecff6ba3a7dc226e84 SHA512 8cc18deb4c14feb71de2624637e1df708ddbcaebd543c03e177a1cfe6c2f63e09af7e787c730f11d3d0332659d2642e5076f6a83f3580f5c0afc8bdb9537733a -EBUILD imagemagick-6.9.10.3.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237 -EBUILD imagemagick-6.9.10.5.ebuild 5186 BLAKE2B b6a74aa80f1d156fdf2f44b4a6a9fb0896bb8ae7876e22f766724e36f23638c1a93cde03178b89f88421de9f3b902ca84552422bb76dfa82bfe4186389f847e3 SHA512 95535e041888bc88c766cc55c1c1b8ec9dead286a98c150e15b2e107e2b16100eafc040fd693b45477bbbf842b156fb3f135c850c949e6bc4e9ae2a82cba24c6 -EBUILD imagemagick-6.9.10.6.ebuild 5194 BLAKE2B ff0cb28f803d22d4ab9a01715668c4aa749edc8376d117910748cf22d5e492ca6ce2b6b4b5e5cc2a128797f2a812e21604fd4d2ca6a8a9d0129effd923feea94 SHA512 7f505cfb89213208d0fea6edff576dfcc495f0ef3c396baa076acf50359f2dd631d48242fb315a6ca3764e2460bb34ad9092d4d0b21306e62a3a75ff3a51afc5 -EBUILD imagemagick-6.9.10.7.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237 -EBUILD imagemagick-6.9.10.8.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237 -EBUILD imagemagick-6.9.9.31.ebuild 5120 BLAKE2B 0d046adad40ac52ebb6f091eae800054b7c22ebd425f6e64a7de68fd6f10ecd699c537a5284f39f496f02be1ecfc44252209599589a3c8686f81988a8e7adfbd SHA512 b45803b538b7d1c6e3d4c3abcd363354b561e01360eaf36cf587e61bae66bbc2543d754dbae8b782cff89aafec267538253f6e3af34211e146e152d1a688e140 -EBUILD imagemagick-6.9.9.40.ebuild 5121 BLAKE2B 686029e7c87384f8f6e06c0eb0ed3a348a48b0e52bddca4f4942cc105b2f1d280859031c9aa6ea9198c981373e74a9f9dd19e95e553e62b6e9d6f9c3d41b8265 SHA512 4c02b42d699833cc4ab7597d576d21d64f991bb947d9193992ce3100d0599fa0cd71306c93316521409b096bd813f3720a474283491dc3e937a8a68264b3b3e7 -EBUILD imagemagick-6.9.9.47.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20 -EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233774ff8c44cab855aa50b79c22502adeeb38879fc8c454c428504b8d290e4fa7b41386a3a0404204df322928cf180425c SHA512 a9b3b238e38e931d534fe4826b0ba525bc6c9850a1aca244c701199d66fa989faf86d7c0a4995a0012e5bb68bbf09e15628494aebe8bbb3b8dc8a725a5e95885 -EBUILD imagemagick-7.0.7.28.ebuild 5127 BLAKE2B 8f974d1ca9caeafa2894d3210407f9f0455bd342c3c92505e595bb623ee1e729cecab7f4229f124a74e8ca6d25d942646b69af2c3f01ccf7fe617bdf167ab0c2 SHA512 4f87c1cf80d6e9fa77e2a7f5241e7958afc151c4d434b87f305e9a528ed1f238fe383f0276916b138ac11c769c3acfcefa5b4a420e16c2f0dcb41e66eaaecf34 -EBUILD imagemagick-7.0.7.35.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77 -EBUILD imagemagick-7.0.8.3.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a -EBUILD imagemagick-7.0.8.5.ebuild 5192 BLAKE2B eb7eeb353817652e4727feec98b14f38d4a41fffa04c7c049b8ffa0464b3ebfd1bd32e4856b43c15c3bbf0f6b107acfb7d8844e701f11037eadfaaed0bf76147 SHA512 88d555134172c3994879bfae7ab94d9c941c54a409e5b2a2dd612181af7854a2b1ff12197d3e73a60db5b7d285d886cfe61d5cbd63d3d1fb35db5712ee134330 -EBUILD imagemagick-7.0.8.6.ebuild 5200 BLAKE2B c4b5732ddbfa435ffc44643f499da8babb26d52852595abcd2173f0929c4ac693c3a990bd00009a0bb388aa7b100d3e470975298d1fa7147a70ee360a5909dfb SHA512 3240cb6179cb5d08d462bbc700cf77bf5e1a0359b09495bc58c050889f9805cd068cbae24098e869372e2191ead596e2f35e4b645c698562a1cf0920fa0702ab -EBUILD imagemagick-7.0.8.7.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a -EBUILD imagemagick-7.0.8.8.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a +EBUILD imagemagick-6.9.10.8.ebuild 5125 BLAKE2B defc438b96f73a2af272220759e0d1e0c510165cb12eb2ffa2fdb8f571ffafb59037c62e92ed3c31f045b77bc90afcc11fc7eced7af39ca17be78df778d7131b SHA512 870751296c3b2e2a399037fa7f9d5206e2bc2e1efd1c0386f7f663c5e79a95ec6bc1011df1716a8da046f6a0c2a49fd2295b5ecacc325b5423e3735c43b31662 +EBUILD imagemagick-7.0.8.8.ebuild 5131 BLAKE2B 20cffac4ad29a620deb03c1a408a0550d191fbe79e05b85c26437298c15c004e1300ef6f6f698b4933fb27b0c059be391b2937e283fb157ee9e90ee53dce8710 SHA512 e21135d9cb19c096a372fe85f05e50f66e31899e77a4a84bdc201f9e924cc2495ed807090b42250612e494a6cc6be221a2852c123493188a5f931c00c794f508 EBUILD imagemagick-9999.ebuild 5297 BLAKE2B dd922782da40926064b6fdceb7cd0c9cb16f7187ac94ace7aee3c2581bc5d4bc86dd19d4eb9068083d93f401970f2a673af445c589b93ab0709735a67af18b79 SHA512 24762b7a8642ad54f88dabfdf5966b99e406977eafc486544720c466f1eac54e84ab7a496b81d8438e04ff0ad2bb943680c258a37a66cd28b8bd4677aadd7dee MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7 diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch deleted file mode 100644 index c568ed345ecd..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch +++ /dev/null @@ -1,36 +0,0 @@ -Gentoo-Bug: https://bugs.gentoo.org/653752 -Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019 - - -From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001 -From: Svante Signell -Date: Mon, 25 Jun 2018 16:06:19 +0200 -Subject: Fix FTBFS on i386 any - -bug-debian: https://bugs.debian.org/898914 ---- - Magick++/tests/attributes.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp -index 9ebc67f2d..e969def27 100644 ---- a/Magick++/tests/attributes.cpp -+++ b/Magick++/tests/attributes.cpp -@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv) - // - - // Test default value. -- if ( image.backgroundColor() != ColorRGB("white") ) -+ if ( image.backgroundColor() != string(ColorRGB("white")) ) - { - ++failures; - cout << "Line: " << __LINE__ << ", backgroundColor default (" -@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv) - // pixelColor - // - // Test default -- if ( image.pixelColor(40,60) != canvasColor ) -+ if ( image.pixelColor(40,60) != string(canvasColor) ) - { - ++failures; - cout << "Line: " << __LINE__ << ", pixelColor default (" diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild deleted file mode 100644 index 1d46b538e85c..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild deleted file mode 100644 index 768f4c5cbe1d..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild deleted file mode 100644 index 07ebb1e3f538..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild deleted file mode 100644 index 1d46b538e85c..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild index 1d46b538e85c..02f80cc50b4e 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild deleted file mode 100644 index f92a349caf39..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild deleted file mode 100644 index 7805c757cc97..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild deleted file mode 100644 index 52e77059cb1d..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild deleted file mode 100644 index 0c38238d52c4..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild deleted file mode 100644 index ba362cfde7f7..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild deleted file mode 100644 index 1db0353011d7..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild deleted file mode 100644 index 49b5b2b7bbd7..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild deleted file mode 100644 index 95dea12510ff..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild deleted file mode 100644 index 15b1ca966bf5..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild deleted file mode 100644 index 49b5b2b7bbd7..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild index 49b5b2b7bbd7..9b07f999f005 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index e451d47db058..365a3aa16290 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -1,5 +1,5 @@ DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172 EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38 -EBUILD libimagequant-2.11.7.ebuild 1174 BLAKE2B d6aeb054e5e2c2cde94faf796a20ddc75ccfe7f1007cbe2162aab0b69df1ad3171890b9c246ce13637122bb094055a2d3eb991c8a36931a35dafb2b77ea74115 SHA512 8bf954b852f8c98db0569d7bec52b24969f6efda3db5f80bf7d55565f5871d89e0d451cc65df3948d0383852bf368ddb5335bff3db09c6d93fa114f7618ce168 +EBUILD libimagequant-2.11.7.ebuild 1181 BLAKE2B 40eb12d77b6aed2a0e727331a543757d9f0d6462504f6c295cccb456229002bcca03b15d97f31a95fdb9005f67fbcdb6e08f72c66049cb928d465a10a5563e54 SHA512 eea74b7ac603264697c395f51379cebc7a250765aad0f899e1e71ea7f0b37dc2dbad2af35114e6ab75ec5a487dd679392ba73b4a109ce99c87736c036094a590 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11 diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild index 67f0e32593a6..1c7d79aad139 100644 --- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 debug openmp static-libs" DEPEND="" diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index f09447431246..1ac3b220a9f5 100644 --- a/media-gfx/mypaint/Manifest +++ b/media-gfx/mypaint/Manifest @@ -7,5 +7,6 @@ DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786b EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477 EBUILD mypaint-1.2.0.ebuild 1738 BLAKE2B e81f01dd6cafee8337c2d6c7d967a02341d9ca4cab1fc8815b2eee71bcf186c32d6ebcc9655038e33f46018342a85be807dd05ba046c26932f67a4f332469ca8 SHA512 d00e0825a85be9e5129fd7895c9b08d91037a1c291d50a8bf2e425eca235d527386013092898061e173855af3c3c2c9c6ab93cef7c5309e028683bb7841217e4 EBUILD mypaint-1.2.1-r1.ebuild 1742 BLAKE2B cddbca3b26a6f941fe684b05a9633aac0603f36a241701635d3fbb84a219ab357ed6346d047fa661450be64eaf48386e1f2eafe63e879028e63a5c08d8fa98ae SHA512 22c95f69ac1a55f986a969b5153db3d0c1d98479ef026f7ef902eeb6a249089c141674b38525a34b697306158cc4010a5d260e0229bb0ae855c9a8f7224f0d93 +EBUILD mypaint-1.2.1-r2.ebuild 1798 BLAKE2B 3d417928f99d11fbc942c16194faf94769164e0e4f2c99fe9a18aece385ff98fde3e71ecbb4057ad6598fcf4c71fe3fd2336d2c76c9b2ad4a20aa5b5916a3c07 SHA512 bad5e79ddca06cc0d37d161752cca100d903a652e88570363722c603cf927516b2c03af58c7d7d57143186c1e1264d24ab74cd8dd5787bd763111a9e5b46c7b6 EBUILD mypaint-1.2.1.ebuild 1881 BLAKE2B 62c4152f2763737e6709fe5425aaab71c2bd69a3560c8acfab36997270d2e1690bb113ed15cbdaa464e8fed828249386cdb547621a1de7cc5e0c39318ab4379c SHA512 900af1c50c8d860b9e0551f7c12abe9ee3df5e21b900b78a92c17e7b9abf57968d6c1a895eb56869e9a45e2132bab40b3a9de6f49990f67577786904e8dccffd MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb diff --git a/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild new file mode 100644 index 000000000000..6dc9afe61a5e --- /dev/null +++ b/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit flag-o-matic fdo-mime gnome2-utils scons-utils toolchain-funcs python-single-r1 + +DESCRIPTION="fast and easy graphics application for digital painters" +HOMEPAGE="http://mypaint.org/" +SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW" + +RDEPEND=" + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.4[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + >=dev-libs/json-c-0.11:= + media-libs/lcms:2 + >=media-libs/libmypaint-1.3.0 + media-libs/libpng:0= + gnome-base/librsvg + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND} + dev-lang/swig + virtual/pkgconfig" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_compile() { + #workaround scons bug with locales. Bug #352700 + export LANG="en_US.UTF-8" + tc-export CC CXX + strip-flags # scons upstream issue #3017 + escons +} + +src_install () { + escons prefix="${D}/usr" install + newicon pixmaps/${PN}_logo.png ${PN}.png + for x in ${LANGS}; do + if ! has ${x} ${LINGUAS}; then + rm -rf "${ED}"/usr/share/locale/${x} || die + fi + done + + python_optimize "${D}"usr/share/${PN} + # not used and broken + rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die + # already provided by system-libmypaint + rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest index f0655a923e05..7702508cd94b 100644 --- a/media-gfx/opentoonz/Manifest +++ b/media-gfx/opentoonz/Manifest @@ -3,5 +3,5 @@ AUX opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e4 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44 EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35 -EBUILD opentoonz-1.2.1.ebuild 2253 BLAKE2B b620d793a36f917b97fbd0e6910da5af293e47c602f2216eccfac294c4f65c124288336cbe84cbde3257436b4196bff11111ca62f1883e58937e58f032ea87f9 SHA512 b715e69ad8e8b013493c25c10cdcdf01c9a3de5bb70f689cf3ef971d3259874f040a3b977741957f645190b49f3da0dff171e6b05ca17bf85c8575befcc04be7 +EBUILD opentoonz-1.2.1-r1.ebuild 2186 BLAKE2B cbd057c9b0cc2830f4168a5e044abd28d59e9395b51341463f204837c0e7a91f0c3a12905a34e06368b4d7f328a743c68808062754dba85d331d69b992970e2b SHA512 0ab9b5ec34212e2ded9a7b80efa8150b2bf4197d43dea613529f782bb1c2470b34beebb244bb38a79e4634e742ff67a9b482c4922d3f78432ae7c81b0dcdfe24 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild new file mode 100644 index 000000000000..bcb59bf1a284 --- /dev/null +++ b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="An open-source full-featured 2D animation creation software" +HOMEPAGE="https://github.com/opentoonz/opentoonz" +SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD libtiff" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + app-arch/lz4:= + >=dev-libs/boost-1.55.0:= + dev-libs/lzo:2= + >=dev-qt/qtcore-5.9:5 + >=dev-qt/qtgui-5.9:5 + >=dev-qt/qtmultimedia-5.9:5[widgets] + >=dev-qt/qtnetwork-5.9:5 + >=dev-qt/qtopengl-5.9:5 + >=dev-qt/qtprintsupport-5.9:5 + >=dev-qt/qtscript-5.9:5 + >=dev-qt/qtsvg-5.9:5 + >=dev-qt/qtwidgets-5.9:5 + >=dev-qt/qtxml-5.9:5 + media-libs/freeglut:= + media-libs/freetype:2= + media-libs/glew:= + media-libs/libjpeg-turbo:= + >=media-libs/libmypaint-1.3.0 + media-libs/libpng:= + media-libs/libsdl2:= + sci-libs/cblas-reference:= + >=sci-libs/superlu-4.1:= + sys-libs/zlib:= + virtual/libusb:= + virtual/opengl +" +DEPEND=" + $RDEPEND + virtual/pkgconfig + dev-qt/linguist-tools:5 +" + +CMAKE_USE_DIR="${S}"/toonz/sources + +src_configure() +{ + local mycmakeargs=( + -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a" + -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu" + -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo" + -DCMAKE_SKIP_RPATH=ON + ) + + # The upstream uses their own modified libtiff + # See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff + cd thirdparty/tiff-4.0.3 || die + econf \ + --with-pic \ + --disable-jbig \ + --enable-static \ + --disable-shared + + cmake-utils_src_configure +} + +src_compile() { + cd "${S}"/thirdparty/tiff-4.0.3 || die + emake + + cmake-utils_src_compile +} + +pkg_postinst() +{ + elog "It is supposedly optional but some files are" + elog "actually required to run the executable properly." + elog + elog "The .config/OpenToonz/ directory in your home folder" + elog "will contain your settings, work and other files." + elog + elog "We need to create it from the command-line:" + elog + elog "$ mkdir -p \$HOME/.config/OpenToonz" + elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/" +} diff --git a/media-gfx/opentoonz/opentoonz-1.2.1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1.ebuild deleted file mode 100644 index 84389a579e27..000000000000 --- a/media-gfx/opentoonz/opentoonz-1.2.1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="An open-source full-featured 2D animation creation software" -HOMEPAGE="https://github.com/opentoonz/opentoonz" -SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD libtiff" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - app-arch/lz4:= - >=dev-libs/boost-1.55.0:= - dev-libs/lzo:2= - >=dev-qt/qtcore-5.9:5 - >=dev-qt/qtgui-5.9:5 - >=dev-qt/qtmultimedia-5.9:5[widgets] - >=dev-qt/qtnetwork-5.9:5 - >=dev-qt/qtopengl-5.9:5 - >=dev-qt/qtprintsupport-5.9:5 - >=dev-qt/qtscript-5.9:5 - >=dev-qt/qtsvg-5.9:5 - >=dev-qt/qtwidgets-5.9:5 - >=dev-qt/qtxml-5.9:5 - media-libs/freeglut:= - media-libs/freetype:2= - media-libs/glew:= - media-libs/libjpeg-turbo:= - >=media-libs/libmypaint-1.3.0 - media-libs/libpng:= - media-libs/libsdl2:= - sci-libs/cblas-reference:= - >=sci-libs/superlu-4.1:= - sys-libs/zlib:= - virtual/libusb:= - virtual/opengl -" -DEPEND=" - $RDEPEND - virtual/pkgconfig - dev-qt/linguist-tools:5 -" - -CMAKE_USE_DIR="${S}"/toonz/sources - -PATCHES=( "${FILESDIR}"/${P}-gcc6-no-throw-in-destructors.patch ) - -src_configure() -{ - local mycmakeargs=( - -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a" - -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu" - -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo" - -DCMAKE_SKIP_RPATH=ON - ) - - # The upstream uses their own modified libtiff - # See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff - cd thirdparty/tiff-4.0.3 || die - econf \ - --with-pic \ - --disable-jbig \ - --enable-static \ - --disable-shared - - cmake-utils_src_configure -} - -src_compile() { - cd "${S}"/thirdparty/tiff-4.0.3 || die - emake - - cmake-utils_src_compile -} - -pkg_postinst() -{ - elog "It is supposedly optional but some files are" - elog "actually required to run the executable properly." - elog - elog "The .config/OpenToonz/ directory in your home folder" - elog "will contain your settings, work and other files." - elog - elog "We need to create it from the command-line:" - elog - elog "$ mkdir -p \$HOME/.config/OpenToonz" - elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/" -} diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index a10917c78d09..bdb4846cc28e 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -1,14 +1,6 @@ -AUX openvdb-3.2.0-fix-build-system.patch 10122 BLAKE2B 4ae0390eb98f8c3bc87a959c65885b08ba58389f9d20136a968f37c70b769f2dfb2b3271a10d510c9a24274ce18953223d47423572d05b2ae834f25a03d6aed0 SHA512 15bcce34e0020a229b499aef81ecca496ce4a59fee7a03a47590aaee3491cb6a1bfe44bcc5d2282ac2025f989b3c97b12663442f29bb907a4f5762c59c71618b -AUX openvdb-3.2.0-numpy-fix.patch 449 BLAKE2B 70e829b571897c534e461982377ad343efab951b65e254bf669469f3f20d40fcebbc2365cafb13a2e4b71ed9d1ea4fe9a8074f8c5b2bffac098ec80a61232420 SHA512 3ef31ebe30b849f20e8380096fa0306be8df25c9fc807b74cbacfcedcab21d67b56674a5bd7c896c0fd2453ab165b254d5f3780fce893a4d57f1fc9b99f60cc7 -AUX openvdb-4.0.0-build-docs-once.patch 1318 BLAKE2B bcaf010edb967a040ca7c7cadd4c066e4a7170dd61e974fd9a756f1d9805395041bdfdad746e2d21f82507d23761f6413a2eac26fecbe5ac30cc64a658fd54be SHA512 7255881f72fc718e34318a1e7f5e11305d27a733a914a8b6d7f74a41d356ede04d18cd40e0b483e170b20a2837c29b4b1fcf5c1510b210428783e2458a6fe60a -AUX openvdb-4.0.0-make-docs-optional.patch 2950 BLAKE2B cd9aec39fcc9eed4a3076ea24705b6ddb1d6985ea322cef2e0cbcd0f6b245f214e5f4a67951c69bca802f93b69d8d87acf13060808478445d3d3bb34abb34fc9 SHA512 95d90b3f5c428dd13cac3d382da5950c0bba4d0a1c4722d553e14b6ec6243d3774ac99d9eca770a22c2b90c0c9b4e49351268fcd760cffbb38b64cd4fb2a881f -AUX openvdb-4.0.0-namespace-fixes.patch 4335 BLAKE2B a1330e3024c123f09e26a1760ab9158b17d608f021a308c9a65cf2c7f7d7886b9e3aca52dcb593d170a060469b2a7d29eeada1fedc32ec26392f1cb704bb21b7 SHA512 20808d035b2e7fd07081a430ba97ab97931014665668bf823782615c9d6e29dfed96592f623259c848d3df5e62106fc09d43b89d47e8d0e63f89a3defe089b80 -AUX openvdb-4.0.0-python-module-install-dir-fix.patch 824 BLAKE2B e5ea542f3505c1cf73c6657a18d16812e54ff4c80bfa5e5285c050a2fa6d5747da7f276b6429ba7aa46459d89b11619843dd0c57ada0b43c1d9d292b2efb5be8 SHA512 55786fb82fd5293200c088bf3617d85f73fff380b1ecca569e68d60346c649925e43647f46eff0897047c7b803ab59f6d78a9441b8be8152155ca0ef026fd39b -DIST openvdb-3.2.0.tar.gz 1368870 BLAKE2B 062afa0c3209e30c73310accd84daa6747defc583d003e65e9fbcbc0c2381e78132874b8bdd6f2602d526071761b5fd9d19760d557bdbbe5a39f81b19b3f2c6a SHA512 df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91 -DIST openvdb-4.0.0.tar.gz 1545221 BLAKE2B b418c5a1b51b6deb73867fe0a352d3afb4466dde31734cd1da9a83231f0589880ca3cbf2577389cfa08d419216166504abc8e58848b9fd01dbaea46a3d5470f4 SHA512 138e23408d725f153f5545c8083cd16f6b3e5cf80308e080d5e463f74f947759cdf5f9d818137ebffaf8b2de77bffa8f38ef0d20758a1418aea1c71702c0001d +AUX openvdb-4.0.2-findboost-fix.patch 502 BLAKE2B 3840a5f267c27535654c890d877d050618f2263ada690eb7a0549589dfbf9236cae0b4e04abcad9f1bcfed902ec7d742f81b8ac5d9f60dbf1d0fea07c3b9ba13 SHA512 1e7cd905ee941c8713cf527d6c349127e98b7901c9e853c22abfa8ed691b46780c3817ed61815defaa41c1aa7c4f9895de8d08c3bef847c479af30a4b5f137e6 DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d -EBUILD openvdb-3.2.0.ebuild 4011 BLAKE2B ec6225fcd8d9aa3a17c3286765ceb082f134468fb8e436dc627af0ef74ffea4e462fabf3126f8e0e25d5c89638563f9c8ad8d808fc79fffdcda51cd715936ec9 SHA512 c84c3022dad66f313415e01d35db4c9ce28b5a0863a0e5fd8cb20f7c07537dfd06022d9ba688e0e6469224ca2777891c2d812758e53d649d750022463a14abc6 -EBUILD openvdb-4.0.0.ebuild 1927 BLAKE2B 04de68eb7803c116db62397e227b6f56acb4e81f9208f4c615d3c20753fe6252a2ae2ba414b18a96e2c1015fb0d5623cca86f6b8e967c90de9cac50b4e201766 SHA512 dfffa4cb7393df8683df085935acd528683fc7596132cb49cea3c962772f89d732d9a36081403203a3e11470d258c24ee7c509caed2ae56f156ba2298cc9774e +EBUILD openvdb-4.0.2-r1.ebuild 2002 BLAKE2B 1c1d4ea08177f3d78790501742ab3c6ef41192256cc9f1b99eafa19a66990889e50caac4c66c43834b65fa85e7dcee871c90fa8f0d774c2c3d39bb6745395672 SHA512 c67cb1576bf56eccaee692de2f46bc9998ac4b8c1000fd0f4ce2004b8dd05ae15f46a4a020cf221b9cf25a7fc17cdec8244c501b3617174ef7a8f5b7c053cdab EBUILD openvdb-4.0.2.ebuild 1953 BLAKE2B 52acb99e6a74fd2cd0ad7b96518b08acc7ed9fce91c1f0a50947cc9624e3663f44284e1def469870efe3f1b368dad2b036de1c7b4ad25c360f057023c6ca4c3e SHA512 b7a1da36eabbdce27090902769c80d9c72f97353e58b30802274a89553268b7916c2895356fa4563cc25829968c1c4dde83a972fdc863aae75bb724d556fd919 -MISC metadata.xml 1250 BLAKE2B 17d651b364b0c114b299c16a71755bda7a4d59a44d5bf6c72b651d65fb504248c36821e1f58c5cf0f3f80b41961369d701feb29a49116d7182450a23458b8c55 SHA512 0f89a03fc29a06e46e4b4960fbe42c304a5c9d3052e823bd4b5b58090b439e873fa9b915243bf905e187d766724df93b75ca57abf3c567070ab84bd26315cecc +MISC metadata.xml 1049 BLAKE2B ecb29e1aa1c1e507ee1dbd22b736c252f4013f100e6d47400e130335f2ab37877fa9439ddc73d3a585b44a453f125db37693c251424e92adb6dcf9b965d73d96 SHA512 74cf497d6517b8a9d2e0bf59ed642353a58810bab7727ed07192b3aa125d593a86d95399981e2bb9a5fda858428cc1d79f431d02d974da66001f814dbb9b3c08 diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch b/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch deleted file mode 100644 index 66112af75daf..000000000000 --- a/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch +++ /dev/null @@ -1,262 +0,0 @@ -* Make build system honour the proper ABI library directory. -* Replace -isystem arguments with -I, as the former causes issues with GCC 6. - See also: - https://bugs.gentoo.org/show_bug.cgi?id=597866 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 - ---- a/doxygen-config -+++ b/doxygen-config -@@ -2257,7 +2257,7 @@ - # The default value is: png. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_IMAGE_FORMAT = png -+DOT_IMAGE_FORMAT = svg - - # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to - # enable generation of interactive SVG images that allow zooming and panning. ---- a/Makefile -+++ b/Makefile -@@ -82,6 +82,7 @@ - - # The directory into which to install libraries, executables and header files - DESTDIR := /tmp/OpenVDB -+libdir = lib - - # The parent directory of the boost/ header directory - BOOST_INCL_DIR := $(HT)/include -@@ -158,6 +159,9 @@ - # The directory containing libpython - PYTHON_LIB_DIR := $(HFS)/python/lib - PYTHON_LIB := -lpython$(PYTHON_VERSION) -+# The Directory to install the python module and includes to. -+PYTHON_INSTALL_INCL_DIR := $(DESTDIR)/python/include/python$(PYTHON_VERSION) -+PYTHON_INSTALL_LIB_DIR := $(DESTDIR)/python/lib/python$(PYTHON_VERSION) - # The directory containing libboost_python - BOOST_PYTHON_LIB_DIR := /rel/depot/third_party_build/boost/rhel6-1.46.1-0/lib - BOOST_PYTHON_LIB := -lboost_python-gcc41-mt-python26-1_46_1 -@@ -179,7 +183,6 @@ - # (leave blank if Doxygen is unavailable) - DOXYGEN := doxygen - -- - # - # Ideally, users shouldn't need to change anything below this line. - # -@@ -207,11 +210,7 @@ - endif - endif - --ifeq (yes,$(strip $(debug))) -- OPTIMIZE := -g --else -- OPTIMIZE := -O3 -DNDEBUG --endif -+OPTIMIZE := -DNDEBUG - - ifeq (yes,$(strip $(verbose))) - QUIET := -@@ -242,12 +241,12 @@ - has_python := yes - endif - --INCLDIRS := -I . -I .. -isystem $(BOOST_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) -isystem $(TBB_INCL_DIR) -+INCLDIRS := -I. -I.. -I$(BOOST_INCL_DIR) -I$(ILMBASE_INCL_DIR) -I$(TBB_INCL_DIR) - ifeq (yes,$(has_blosc)) -- INCLDIRS += -isystem $(BLOSC_INCL_DIR) -+ INCLDIRS += -I$(BLOSC_INCL_DIR) - endif - ifeq (yes,$(has_log4cplus)) -- INCLDIRS += -isystem $(LOG4CPLUS_INCL_DIR) -+ INCLDIRS += -I$(LOG4CPLUS_INCL_DIR) - endif - - CXXFLAGS += -std=c++0x -@@ -565,9 +564,9 @@ - python/pyTransform.cc \ - python/pyVec3Grid.cc \ - # --PYCXXFLAGS := -fPIC -isystem python -isystem $(PYTHON_INCL_DIR) -isystem $(PYCONFIG_INCL_DIR) -+PYCXXFLAGS := -fPIC -Ipython -I$(PYTHON_INCL_DIR) -I$(PYCONFIG_INCL_DIR) - ifneq (,$(strip $(NUMPY_INCL_DIR))) --PYCXXFLAGS += -isystem $(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY -+PYCXXFLAGS += -I$(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY - endif - ifneq (no,$(strip $(PYTHON_WRAP_ALL_GRID_TYPES))) - PYCXXFLAGS += -DPY_OPENVDB_WRAP_ALL_GRID_TYPES -@@ -678,7 +677,7 @@ - @echo "Building $@ because of $(call list_deps)" - $(CXX) -c $(CXXFLAGS) -fPIC -o $@ $< - --all: lib python vdb_print vdb_render vdb_test depend -+all: lib python vdb_print vdb_render vdb_view vdb_test depend - - $(OBJ_NAMES): %.o: %.cc - @echo "Building $@ because of $(call list_deps)" -@@ -719,8 +718,13 @@ - @echo "Generating documentation because of $(list_deps)" - echo -e 'OUTPUT_DIRECTORY=./doc\nGENERATE_LATEX=YES\nGENERATE_HTML=NO' \ - | cat doxygen-config - | $(DOXYGEN) - $(QUIET) \ -- && cd ./doc/latex && make refman.pdf $(QUIET) \ -+ && cd ./doc/latex && $(MAKE) refman.pdf $(QUIET) \ - && echo 'Created doc/latex/refman.pdf' -+ @# -+ mkdir -p $(DESTDIR)/share/doc/openvdb/pdf; \ -+ echo "Created $(DESTDIR)/share/doc/openvdb/pdf"; \ -+ cp -r -f doc/latex/refman.pdf $(DESTDIR)/share/doc/openvdb/pdf/; \ -+ echo "Copied documentation to $(DESTDIR)/share/doc/openvdb/pdf/"; \ - - ifneq (,$(strip $(DOXYGEN))) - doc: $(DOC_INDEX) -@@ -734,14 +738,14 @@ - - vdb_print: $(LIBOPENVDB) cmd/openvdb_print/main.cc - @echo "Building $@ because of $(list_deps)" -- $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I . \ -+ $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I. \ - $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ - $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB) - - vdb_render: $(LIBOPENVDB) cmd/openvdb_render/main.cc - @echo "Building $@ because of $(list_deps)" -- $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I . \ -- -isystem $(EXR_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) \ -+ $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I. \ -+ -I$(EXR_INCL_DIR) -I$(ILMBASE_INCL_DIR) \ - -Wl,-rpath,$(EXR_LIB_DIR) -L$(EXR_LIB_DIR) $(EXR_LIB) \ - -Wl,-rpath,$(ILMBASE_LIB_DIR) -L$(ILMBASE_LIB_DIR) $(ILMBASE_LIB) \ - $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ -@@ -761,12 +765,12 @@ - $(LIBVIEWER_OBJ_NAMES): $(LIBVIEWER_INCLUDE_NAMES) - $(LIBVIEWER_OBJ_NAMES): %.o: %.cc - @echo "Building $@ because of $(list_deps)" -- $(CXX) -c $(CXXFLAGS) -I . -isystem $(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $< -+ $(CXX) -c $(CXXFLAGS) -I. -I$(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $< - - vdb_view: $(LIBOPENVDB) $(LIBVIEWER_OBJ_NAMES) cmd/openvdb_view/main.cc - @echo "Building $@ because of $(list_deps)" - $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_view/main.cc $(LIBVIEWER_OBJ_NAMES) \ -- -I . -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \ -+ -I. -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \ - $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ - $(LIBVIEWER_FLAGS) $(LIBS_RPATH) $(BOOST_THREAD_LIB) $(CONCURRENT_MALLOC_LIB) - endif -@@ -776,7 +780,7 @@ - $(PYTHON_OBJ_NAMES): $(PYTHON_INCLUDE_NAMES) - $(PYTHON_OBJ_NAMES): %.o: %.cc - @echo "Building $@ because of $(list_deps)" -- $(CXX) -c $(CXXFLAGS) -I . $(PYCXXFLAGS) -o $@ $< -+ $(CXX) -c $(CXXFLAGS) -I. $(PYCXXFLAGS) -o $@ $< - $(PYTHON_MODULE): $(LIBOPENVDB) $(PYTHON_OBJ_NAMES) - @echo "Building $@ because of $(list_deps)" - $(CXX) $(CXXFLAGS) $(PYCXXFLAGS) -shared $(PYTHON_SONAME_FLAGS) -o $@ $(PYTHON_OBJ_NAMES) \ -@@ -784,6 +788,22 @@ - -Wl,-rpath,$(BOOST_PYTHON_LIB_DIR) -L$(BOOST_PYTHON_LIB_DIR) $(BOOST_PYTHON_LIB) \ - $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ - $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB) -+ @echo "Installing the python module and includes" -+ @# -+ mkdir -p $(PYTHON_INSTALL_INCL_DIR); \ -+ echo "Created $(PYTHON_INSTALL_INCL_DIR)"; \ -+ cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $(PYTHON_INSTALL_INCL_DIR)/; \ -+ echo "Copied Python header files to $(PYTHON_INSTALL_INCL_DIR)"; \ -+ mkdir -p $(PYTHON_INSTALL_LIB_DIR); \ -+ echo "Created $(PYTHON_INSTALL_LIB_DIR)"; \ -+ cp -f $(PYTHON_MODULE) $(PYTHON_INSTALL_LIB_DIR)/; \ -+ pushd $(PYTHON_INSTALL_LIB_DIR) > /dev/null; \ -+ ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \ -+ popd > /dev/null; \ -+ echo "Copied Python module to $(PYTHON_INSTALL_LIB_DIR)" -+ @echo "Clean the Python modules so the next one will compile" -+ @# -+ $(RM) $(PYTHON_OBJ_NAMES) - - ifeq (yes,$(has_python)) - ifneq (,$(strip $(EPYDOC))) -@@ -794,7 +814,7 @@ - echo "Created $${pydocdir}"; \ - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(CURDIR); \ - export PYTHONPATH=${PYTHONPATH}:$(CURDIR); \ -- $(EPYDOC) --html -o $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET) -+ $(EPYDOC) --html --html-dir $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET) - else - pydoc: - @echo "$@"': $$EPYDOC is undefined' -@@ -815,7 +835,7 @@ - - $(UNITTEST_OBJ_NAMES): %.o: %.cc - @echo "Building $@ because of $(list_deps)" -- $(CXX) -c $(CXXFLAGS) -isystem $(CPPUNIT_INCL_DIR) -fPIC -o $@ $< -+ $(CXX) -c $(CXXFLAGS) -I$(CPPUNIT_INCL_DIR) -fPIC -o $@ $< - - ifneq (,$(strip $(CPPUNIT_INCL_DIR))) - vdb_test: $(LIBOPENVDB) $(UNITTEST_OBJ_NAMES) -@@ -835,7 +855,7 @@ - @echo "$@"': $$(CPPUNIT_INCL_DIR) is undefined' - endif - --install: lib python vdb_print vdb_render vdb_view doc pydoc -+install: lib vdb_print vdb_render vdb_view doc pydoc - mkdir -p $(DESTDIR)/include/openvdb - @echo "Created $(DESTDIR)/include/openvdb" - pushd $(DESTDIR)/include/openvdb > /dev/null; \ -@@ -851,42 +871,25 @@ - fi - @echo "Copied header files to $(DESTDIR)/include" - @# -- mkdir -p $(DESTDIR)/lib -- @echo "Created $(DESTDIR)/lib/" -- cp -f $(LIBOPENVDB) $(DESTDIR)/lib -- pushd $(DESTDIR)/lib > /dev/null; \ -+ mkdir -p $(DESTDIR)/$(libdir) -+ @echo "Created $(DESTDIR)/$(libdir)/" -+ cp -f $(LIBOPENVDB) $(DESTDIR)/$(libdir) -+ pushd $(DESTDIR)/$(libdir) > /dev/null; \ - if [ -f $(LIBOPENVDB_SHARED) ]; then \ - ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SHARED_NAME); \ - ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SONAME); \ - fi; \ - popd > /dev/null -- @echo "Copied libopenvdb to $(DESTDIR)/lib/" -+ @echo "Copied libopenvdb to $(DESTDIR)/$(libdir)/" - @# - if [ -f $(LIBVIEWER) ]; \ - then \ -- cp -f $(LIBVIEWER) $(DESTDIR)/lib; \ -- pushd $(DESTDIR)/lib > /dev/null; \ -+ cp -f $(LIBVIEWER) $(DESTDIR)/$(libdir); \ -+ pushd $(DESTDIR)/$(libdir) > /dev/null; \ - if [ -f $(LIBVIEWER_SHARED) ]; then \ - ln -f -s $(LIBVIEWER_SHARED) $(LIBVIEWER_SHARED_NAME); fi; \ - popd > /dev/null; \ -- echo "Copied libopenvdb_viewer to $(DESTDIR)/lib/"; \ -- fi -- @# -- if [ -f $(PYTHON_MODULE) ]; \ -- then \ -- installdir=$(DESTDIR)/python/include/python$(PYTHON_VERSION); \ -- mkdir -p $${installdir}; \ -- echo "Created $${installdir}"; \ -- cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $${installdir}/; \ -- echo "Copied Python header files to $${installdir}"; \ -- installdir=$(DESTDIR)/python/lib/python$(PYTHON_VERSION); \ -- mkdir -p $${installdir}; \ -- echo "Created $${installdir}"; \ -- cp -f $(PYTHON_MODULE) $${installdir}/; \ -- pushd $${installdir} > /dev/null; \ -- ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \ -- popd > /dev/null; \ -- echo "Copied Python module to $${installdir}"; \ -+ echo "Copied libopenvdb_viewer to $(DESTDIR)/$(libdir)/"; \ - fi - @# - mkdir -p $(DESTDIR)/bin -@@ -924,7 +927,7 @@ - for f in $(UNITTEST_SRC_NAMES); \ - do $(CXX) $(CXXFLAGS) -O0 \ - -MM $$f -MT `echo $$f | sed 's%\.[^.]*%.o%'` \ -- -isystem $(CPPUNIT_INCL_DIR) >> $(DEPEND); \ -+ -I$(CPPUNIT_INCL_DIR) >> $(DEPEND); \ - done; \ - fi - diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch b/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch deleted file mode 100644 index bef10240477c..000000000000 --- a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc -index 508c787..dd069e0 100644 ---- a/python/pyOpenVDBModule.cc -+++ b/python/pyOpenVDBModule.cc -@@ -592,8 +592,12 @@ BOOST_PYTHON_MODULE(PY_OPENVDB_MODULE_NAME) - - #ifdef PY_OPENVDB_USE_NUMPY - // Initialize NumPy. -+#if PY_MAJOR_VERSION >= 3 -+ if (_import_array()) { }; -+#else - import_array(); - #endif -+#endif - - using namespace openvdb::OPENVDB_VERSION_NAME; - diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch b/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch deleted file mode 100644 index 5a8baee0f260..000000000000 --- a/media-gfx/openvdb/files/openvdb-4.0.0-build-docs-once.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5bb7bc424b09f93417a1d447f2d4f3081394f964 Mon Sep 17 00:00:00 2001 -From: Nicholas Yue -Date: Thu, 17 Nov 2016 16:59:47 -0800 -Subject: [PATCH] Refine Doxygen run so that it is done only once and only - during the installation phase - ---- - openvdb/CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt -index aa1a080..88e46ca 100644 ---- a/openvdb/CMakeLists.txt -+++ b/openvdb/CMakeLists.txt -@@ -443,13 +443,15 @@ IF (OPENVDB_BUILD_DOCS) - FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} ) - FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" ) - -- ADD_CUSTOM_TARGET ( doc ALL -+ ADD_CUSTOM_TARGET ( doc - ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - COMMENT "Generating API documentation with Doxygen" VERBATIM - ) - -- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION doc) -+ INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)") -+ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs) -+ - ENDIF () - - # Installation diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch b/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch deleted file mode 100644 index 92c4fa320596..000000000000 --- a/media-gfx/openvdb/files/openvdb-4.0.0-make-docs-optional.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3c7f3247e443620658a5cb7b4e9cdea488c450d9 Mon Sep 17 00:00:00 2001 -From: Nicholas Yue -Date: Thu, 17 Nov 2016 03:58:58 -0800 -Subject: [PATCH] Fix the Doxygen generation problem but current solution is - not very elegant as there was a regeneration run of Doxygen. Committing this - for now so that at least it will work for the initial 4.0.0 release. - Introduce a CMake option variable to toggle the generation and installation - of doxygen - ---- - CMakeLists.txt | 1 + - openvdb/CMakeLists.txt | 27 +++++++++++++++------------ - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 739d57f..32f82d2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,6 +33,7 @@ PROJECT ( OpenVDB ) - ENABLE_TESTING() - - OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON ) -+OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF ) - OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON ) - OPTION ( OPENVDB_BUILD_HOUDINI_SOPS "Build the Houdini SOPs" OFF ) - OPTION ( OPENVDB_BUILD_MAYA_PLUGIN "Build the Maya plugin" OFF ) -diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt -index f86b306..aa1a080 100644 ---- a/openvdb/CMakeLists.txt -+++ b/openvdb/CMakeLists.txt -@@ -97,7 +97,9 @@ FIND_PACKAGE ( ZLIB REQUIRED ) - FIND_PACKAGE ( ILMBase REQUIRED ) - FIND_PACKAGE ( OpenEXR REQUIRED ) - FIND_PACKAGE ( OpenGL REQUIRED ) --FIND_PACKAGE ( Doxygen REQUIRED ) -+IF (OPENVDB_BUILD_DOCS) -+ FIND_PACKAGE ( Doxygen REQUIRED ) -+ENDIF () - IF (OPENVDB_BUILD_UNITTESTS) - FIND_PACKAGE ( CPPUnit REQUIRED ) - ENDIF () -@@ -435,17 +437,18 @@ IF ( OPENVDB_BUILD_PYTHON_MODULE ) - ENDIF ( OPENVDB_BUILD_PYTHON_MODULE ) - - # Doxygen docmentation --FILE ( READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config DOXYGEN_CONFIG_CONTENT ) --FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} ) --FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" ) -- --ADD_CUSTOM_TARGET ( doc -- ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} -- COMMENT "Generating API documentation with Doxygen" VERBATIM --) -- --IF ( EXISTS ${CMAKE_CURRENT_BINARY_DIR}/doc/html ) -+IF (OPENVDB_BUILD_DOCS) -+ -+ FILE ( READ ${CMAKE_CURRENT_SOURCE_DIR}/doxygen-config DOXYGEN_CONFIG_CONTENT ) -+ FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} ) -+ FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" ) -+ -+ ADD_CUSTOM_TARGET ( doc ALL -+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config -+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} -+ COMMENT "Generating API documentation with Doxygen" VERBATIM -+ ) -+ - INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION doc) - ENDIF () - diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch b/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch deleted file mode 100644 index 913c6079a081..000000000000 --- a/media-gfx/openvdb/files/openvdb-4.0.0-namespace-fixes.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -purN a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake ---- a/cmake/FindILMBase.cmake 2016-11-16 20:24:17.000000000 +0000 -+++ b/cmake/FindILMBase.cmake 2017-01-05 09:28:43.941910625 +0000 -@@ -57,15 +57,15 @@ OPTION ( ILMBASE_NAMESPACE_VERSIONING "N - - IF ( ILMBASE_FOUND ) - -- FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ") -- STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}") -- STRING ( STRIP ${_ilmbase_version_major_unstrip} ILMBASE_VERSION_MAJOR ) -+ IF ( ILMBASE_NAMESPACE_VERSIONING ) -+ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR ") -+ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" _ilmbase_version_major_unstrip "${_ilmbase_version_major_string}") -+ STRING ( STRIP ${_ilmbase_version_major_unstrip} ILMBASE_VERSION_MAJOR ) - -- FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ") -- STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}") -- STRING ( STRIP ${_ilmbase_version_minor_unstrip} ILMBASE_VERSION_MINOR ) -+ FILE ( STRINGS "${ILMBASE_LOCATION}/include/OpenEXR/IlmBaseConfig.h" _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR ") -+ STRING ( REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" _ilmbase_version_minor_unstrip "${_ilmbase_version_minor_string}") -+ STRING ( STRIP ${_ilmbase_version_minor_unstrip} ILMBASE_VERSION_MINOR ) - -- IF ( ILMBASE_NAMESPACE_VERSIONING ) - SET ( IEX_LIBRARY_NAME Iex-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) - SET ( IEXMATH_LIBRARY_NAME IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) - SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} ) -diff -purN a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake ---- a/cmake/FindOpenEXR.cmake 2016-11-16 20:24:17.000000000 +0000 -+++ b/cmake/FindOpenEXR.cmake 2017-01-05 09:34:51.167736304 +0000 -@@ -52,22 +52,24 @@ OPTION ( OPENEXR_NAMESPACE_VERSIONING "N - - IF ( OPENEXR_FOUND ) - -- FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR ") -- STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" "" _openexr_version_major_unstrip "${_openexr_version_major_string}") -- STRING ( STRIP ${_openexr_version_major_unstrip} OPENEXR_VERSION_MAJOR ) -- -- FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ") -- STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}") -- STRING ( STRIP ${_openexr_version_minor_unstrip} OPENEXR_VERSION_MINOR ) -- -- MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" ) -- - IF ( OPENEXR_NAMESPACE_VERSIONING ) -+ FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR ") -+ STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" "" _openexr_version_major_unstrip "${_openexr_version_major_string}") -+ STRING ( STRIP ${_openexr_version_major_unstrip} OPENEXR_VERSION_MAJOR ) -+ -+ FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ") -+ STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}") -+ STRING ( STRIP ${_openexr_version_minor_unstrip} OPENEXR_VERSION_MINOR ) -+ -+ MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" ) -+ - SET ( ILMIMF_LIBRARY_NAME IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR} ) - ELSE ( OPENEXR_NAMESPACE_VERSIONING ) -+ MESSAGE ( STATUS "Found OpenEXR at ${OPENEXR_LOCATION}" ) -+ - SET ( ILMIMF_LIBRARY_NAME IlmImf ) - ENDIF ( OPENEXR_NAMESPACE_VERSIONING ) -- -+ - SET ( OPENEXR_INCLUDE_DIRS - ${OPENEXR_LOCATION}/include - ${OPENEXR_LOCATION}/include/OpenEXR diff --git a/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch deleted file mode 100644 index 34c6c76ea9da..000000000000 --- a/media-gfx/openvdb/files/openvdb-4.0.0-python-module-install-dir-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -purN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt ---- a/openvdb/CMakeLists.txt 2016-11-16 20:24:17.000000000 +0000 -+++ b/openvdb/CMakeLists.txt 2017-01-09 13:46:00.000000000 +0000 -@@ -426,10 +426,11 @@ IF ( OPENVDB_BUILD_PYTHON_MODULE ) - ADD_TEST ( pytest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/python/test/TestOpenVDB.py ) - SET_TESTS_PROPERTIES ( pytest PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}") - -+ SET ( PYOENVDB_INSTALL_DIRECTORY lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR} CACHE STRING "The directory to install the pyopenvdb.so module.") - INSTALL ( TARGETS - pyopenvdb - DESTINATION -- lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR} -+ ${PYOENVDB_INSTALL_DIRECTORY} - ) - - ENDIF ( OPENVDB_BUILD_PYTHON_MODULE ) diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch new file mode 100644 index 000000000000..12245be3e466 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch @@ -0,0 +1,11 @@ +--- openvdb-4.0.2/openvdb/python/CMakeLists.txt.orig 2018-07-12 20:29:50.745624805 +0200 ++++ openvdb-4.0.2/openvdb/python/CMakeLists.txt 2018-07-12 20:30:10.452305180 +0200 +@@ -3,7 +3,7 @@ + + FIND_PACKAGE ( PythonInterp REQUIRED ) + FIND_PACKAGE ( PythonLibs REQUIRED ) +-FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python ) ++FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} ) + + + IF ( NOT OPENVDB_BUILD_CORE ) diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml index 453013e59bea..806981efae06 100644 --- a/media-gfx/openvdb/metadata.xml +++ b/media-gfx/openvdb/metadata.xml @@ -23,11 +23,6 @@ Enables compatibility with the old 3.x ABI. enabled by dfault. - - Adds enhanced compression to files through - dev-libs/c-blosc. Very useful so - enabled by dfault. - dreamworksanimation/openvdb diff --git a/media-gfx/openvdb/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild deleted file mode 100644 index bdd39bb6e1f4..000000000000 --- a/media-gfx/openvdb/openvdb-3.2.0.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit eutils python-r1 toolchain-funcs - -DESCRIPTION="Libs for the efficient manipulation of volumetric data" -HOMEPAGE="http://www.openvdb.org" - -SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+openvdb-compression doc python X" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - sys-libs/zlib - >=dev-libs/boost-1.62:=[${PYTHON_USEDEP}] - media-libs/openexr - dev-util/cppunit - X? ( media-libs/glfw ) - dev-libs/jemalloc - python? ( dev-python/numpy[${PYTHON_USEDEP}] ) - openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 ) - dev-libs/log4cplus" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - ${COMMON_DEPEND}" - -DEPEND="${RDEPEND} - dev-cpp/tbb - doc? ( - app-doc/doxygen - python? ( dev-python/pdoc[${PYTHON_USEDEP}] ) - ) - ${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/${PN}" - -PATCHES=( - "${FILESDIR}"/${P}-numpy-fix.patch - "${FILESDIR}"/${P}-fix-build-system.patch -) - -python_module_compile() { - mypythonargs=( - PYTHON_VERSION=${EPYTHON/python/} - PYTHON_INCL_DIR="$(python_get_includedir)" - PYCONFIG_INCL_DIR="$(python_get_includedir)" - PYTHON_LIB_DIR="$(python_get_library_path)" - PYTHON_LIB="$(python_get_LIBS)" - PYTHON_INSTALL_INCL_DIR="${D%/}$(python_get_includedir)" - PYTHON_INSTALL_LIB_DIR="${D%/}$(python_get_sitedir)" - NUMPY_INCL_DIR="$(python_get_sitedir)"/numpy/core/include/numpy - BOOST_PYTHON_LIB_DIR="${myprefixlibdir}" - BOOST_PYTHON_LIB=-lboost_python-${EPYTHON/python/} - ) - - einfo "Compiling module for ${EPYTHON}." - emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" CXX="$(tc-getCXX)" - - # This is so the correct version of pdoc is used - mypyscriptdir=$(python_get_scriptdir) -} - -src_compile() { - # The build system is designed to compile and install all - # in one go, so doing each phase separately would be be - # impossible and the functions would all overlap anyways. - # Do nothing - return -} - -src_install() { - local myprefix="${EPREFIX}"/usr - local myprefixlibdir="${myprefix}"/"$(get_libdir)" - local mypyscriptdir - - # So individule targets can be called without duplication - # Common depends: - local myemakeargs=( - rpath=no - shared=yes - libdir="$(get_libdir)" - LIBOPENVDB_RPATH= - DESTDIR="${D}" - HFS="${myprefix}" - HT="${myprefix}" - HDSO="${myprefixlibdir}" - CPPUNIT_INCL_DIR="${myprefix}"/include/cppunit - CPPUNIT_LIB_DIR="${myprefixlibdir}" - LOG4CPLUS_INCL_DIR="${myprefix}"/include/log4cplus - LOG4CPLUS_LIB_DIR="${myprefixlibdir}" - ) - - # Create python list here for use during install phase: - # - If python is used, then the last used module will trigger - # document install phase. It's the same doc, so build once. - # - If no python used, then this will remail blanked out to - # disable pydoc. - # - pydoc will be called if doc and python use flags are set. - local mypythonargs=( - PYTHON_VERSION= - PYTHON_INCL_DIR= - PYCONFIG_INCL_DIR= - PYTHON_LIB_DIR= - PYTHON_LIB= - PYTHON_INSTALL_INCL_DIR= - PYTHON_INSTALL_LIB_DIR= - NUMPY_INCL_DIR= - BOOST_PYTHON_LIB_DIR= - BOOST_PYTHON_LIB= - ) - - # Optional depends: - if use X; then - myemakeargs+=( - GLFW_INCL_DIR="${myprefixlibdir}" - GLFW_LIB_DIR="${myprefixlibdir}" - ) - else - myemakeargs+=( - GLFW_INCL_DIR= - GLFW_LIB_DIR= - GLFW_LIB= - GLFW_MAJOR_VERSION= - ) - fi - - if use openvdb-compression; then - myemakeargs+=( - BLOSC_INCL_DIR="${myprefix}"/include - BLOSC_LIB_DIR="${myprefixlibdir}" - ) - else - myemakeargs+=( - BLOSC_INCL_DIR= - BLOSC_LIB_DIR= - ) - fi - - use doc || myemakeargs+=( DOXYGEN= ) - - # Create python modules for each version selected - use python && python_foreach_impl python_module_compile - - if use python && use doc; then - mypythonargs+=( EPYDOC="${mypyscriptdir}"/pdoc ) - else - mypythonargs+=( EPYDOC="" ) - fi - - einfo "Compiling the main components." - emake install "${myemakeargs[@]}" "${mypythonargs[@]}" CXX="$(tc-getCXX)" -} diff --git a/media-gfx/openvdb/openvdb-4.0.0.ebuild b/media-gfx/openvdb/openvdb-4.0.0.ebuild deleted file mode 100644 index f3168eb1ec2e..000000000000 --- a/media-gfx/openvdb/openvdb-4.0.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit eutils flag-o-matic cmake-utils python-single-r1 - -DESCRIPTION="Libs for the efficient manipulation of volumetric data" -HOMEPAGE="http://www.openvdb.org" - -SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+abi3-compat doc python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] - >=dev-libs/c-blosc-1.5.0 - dev-libs/jemalloc - dev-libs/log4cplus - media-libs/glfw:= - media-libs/openexr:= - sys-libs/zlib - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXinerama - x11-libs/libXcursor - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - dev-cpp/tbb - doc? ( - app-doc/doxygen - python? ( dev-python/pdoc[${PYTHON_USEDEP}] ) - )" - -PATCHES=( - "${FILESDIR}"/${P}-make-docs-optional.patch - "${FILESDIR}"/${P}-build-docs-once.patch - "${FILESDIR}"/${P}-namespace-fixes.patch - "${FILESDIR}"/${P}-python-module-install-dir-fix.patch -) - -src_configure() { - local myprefix="${EPREFIX}"/usr/ - - # To stay in sync with Boost - append-cxxflags -std=c++14 - - # Enable unit tests later in 4.0.1 - local mycmakeargs=( - -DOPENVDB_BUILD_UNITTESTS=OFF - -DOPENVDB_BUILD_DOCS=$(usex doc) - -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) - -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat) - -DBLOSC_LOCATION="${myprefix}" - -DGLEW_LOCATION="${myprefix}" - -DUSE_GLFW3=ON - -DGLFW3_LOCATION="${myprefix}" - -DILMBASE_LOCATION="${myprefix}" - -DILMBASE_NAMESPACE_VERSIONING=OFF - -DOPENEXR_LOCATION="${myprefix}" - -DOPENEXR_NAMESPACE_VERSIONING=OFF - -DTBB_LOCATION="${myprefix}" - ) - - use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=$(python_get_sitedir) ) - - cmake-utils_src_configure -} diff --git a/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild new file mode 100644 index 000000000000..82941626ec77 --- /dev/null +++ b/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit cmake-utils flag-o-matic python-single-r1 + +DESCRIPTION="Libs for the efficient manipulation of volumetric data" +HOMEPAGE="http://www.openvdb.org" +SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+abi3-compat doc python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] + >=dev-libs/c-blosc-1.5.0 + dev-libs/jemalloc + dev-libs/log4cplus + media-libs/glfw:= + media-libs/openexr:= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + python? ( + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + )" + +DEPEND="${RDEPEND} + dev-cpp/tbb + virtual/pkgconfig + doc? ( app-doc/doxygen[latex] )" + +RESTRICT="test" + +PATCHES=( + "${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch" + "${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch" + "${WORKDIR}/0003-Boost-1.65-NumPy-support.patch" + "${FILESDIR}/${P}-findboost-fix.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + # To stay in sync with Boost + append-cxxflags -std=c++14 + + local mycmakeargs=( + -DBLOSC_LOCATION="${myprefix}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DGLEW_LOCATION="${myprefix}" + -DGLFW3_LOCATION="${myprefix}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) + -DOPENVDB_BUILD_UNITTESTS=OFF + -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat) + -DOPENVDB_ENABLE_RPATH=OFF + -DTBB_LOCATION="${myprefix}" + -DUSE_GLFW3=ON + ) + + use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} ) + + cmake-utils_src_configure +} -- cgit v1.2.3