commit:     aa061efc8ee215c57f464f4cf8e7fcfa6a5d935b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 22:20:13 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:39:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa061efc

media-gfx/imagemagick: drop old

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-gfx/imagemagick/Manifest                    |   2 -
 media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild | 185 ----------------------
 media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild  | 185 ----------------------
 3 files changed, 372 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index e00e92a784f..b148196426a 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,3 @@
-DIST ImageMagick-6.9.10-1.tar.xz 8918684 BLAKE2B 
62e77bed14b2a82f2fd2e429142c4200d7b243caa3ed8ff11be672d1c0a9094b7916dcbac11f0876cf46e6aa4753044e0cbe0c25dacafe5966f49d3f586bb747
 SHA512 
570edd18299982769a471ae37b7458401b13aa7802fd9f6ae8a72a2ece34cbf9b30e42a9f06abe62a6b01cc3573fc16d4c43a732260e0dedc8da54fef82f74a4
 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.9-31.tar.xz 8819864 BLAKE2B 
f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa
 SHA512 
85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
@@ -7,6 +6,5 @@ DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B 
f28948d5728cbd2b011091ded2c12b5
 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-1.tar.xz 8606196 BLAKE2B 
fd7bd794793cd9bb063023f2f7f36272efb99a1b75082dd3f71a244b7cb0e28971ff091af5b8a575084f42bd5a4639641b44831dae0cc52ea03d6624a650f01e
 SHA512 
e7f2acb9a7912bb68dced74b7a0381d4909b13aa4fa36e4f3c56479b7b24f8f91ff21c171e542bec63e2873a94adea4673c5351ce1d641f72e8279886eb4b224
 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

diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.10.1.ebuild
deleted file mode 100644
index 52e77059cb1..00000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.1.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.8.1.ebuild 
b/media-gfx/imagemagick/imagemagick-7.0.8.1.ebuild
deleted file mode 100644
index 1db0353011d..00000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.1.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
-}

Reply via email to