jlec        15/01/04 12:02:41

  Modified:             metadata.xml ChangeLog
  Added:                imagemagick-6.9.0.3.ebuild
  Removed:              imagemagick-6.9.0.0.ebuild
  Log:
  media-gfx/imagemagick: Version BUmp, fixes potential security problems, 
#534106; do not inject march, #533634; install some extra_dist files
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.17                 media-gfx/imagemagick/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/metadata.xml?rev=1.17&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/metadata.xml?rev=1.17&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/metadata.xml?r1=1.16&r2=1.17

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/metadata.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- metadata.xml        16 Jun 2012 16:32:04 -0000      1.16
+++ metadata.xml        4 Jan 2015 12:02:41 -0000       1.17
@@ -3,16 +3,16 @@
 <pkgmetadata>
   <herd>graphics</herd>
   <use>
-    <flag name='autotrace'>Use <pkg>media-gfx/autotrace</pkg> to convert 
bitmaps into vector graphics</flag>
-    <flag name='corefonts'>Use <pkg>media-fonts/corefonts</pkg> which is 
required by some commands</flag> 
-    <flag name='fpx'>Enable <pkg>media-libs/libfpx</pkg> support</flag>
-    <flag name='hdri'>enable High Dynamic Range Images formats</flag>
-    <flag name='lqr'>Enable experimental liquid rescale support using 
<pkg>media-libs/liblqr</pkg></flag>
-    <flag name='opencl'>Enable OpenCL support</flag>
-    <flag name='pango'>Enable Pango support using 
<pkg>x11-libs/pango</pkg></flag>
-    <flag name='q32'>Set quantum depth value to 32</flag>
-    <flag name='q64'>Set quantum depth value to 64</flag>
-    <flag name='q8'>Set quantum depth value to 8</flag>
-    <flag name='webp'>Enable webp image format support using 
<pkg>media-libs/libwebp</pkg></flag>
+    <flag name="autotrace">Use <pkg>media-gfx/autotrace</pkg> to convert 
bitmaps into vector graphics</flag>
+    <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is 
required by some commands</flag>
+    <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
+    <flag name="hdri">enable High Dynamic Range Images formats</flag>
+    <flag name="lqr">Enable experimental liquid rescale support using 
<pkg>media-libs/liblqr</pkg></flag>
+    <flag name="opencl">Enable OpenCL support</flag>
+    <flag name="pango">Enable Pango support using 
<pkg>x11-libs/pango</pkg></flag>
+    <flag name="q32">Set quantum depth value to 32</flag>
+    <flag name="q64">Set quantum depth value to 64</flag>
+    <flag name="q8">Set quantum depth value to 8</flag>
+    <flag name="webp">Enable webp image format support using 
<pkg>media-libs/libwebp</pkg></flag>
   </use>
 </pkgmetadata>



1.579                media-gfx/imagemagick/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.579&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.579&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.578&r2=1.579

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- ChangeLog   14 Dec 2014 17:07:08 -0000      1.578
+++ ChangeLog   4 Jan 2015 12:02:41 -0000       1.579
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.578 
2014/12/14 17:07:08 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.579 
2015/01/04 12:02:41 jlec Exp $
+
+*imagemagick-6.9.0.3 (04 Jan 2015)
+
+  04 Jan 2015; Justin Lecher <[email protected]> -imagemagick-6.9.0.0.ebuild,
+  +imagemagick-6.9.0.3.ebuild, metadata.xml:
+  Version BUmp, fixes potential security problems, #534106; do not inject
+  march, #533634; install some extra_dist files
 
   14 Dec 2014; Tim Harder <[email protected]>
   -imagemagick-6.8.8.10-r1.ebuild, -imagemagick-6.8.9.7.ebuild,



1.1                  media-gfx/imagemagick/imagemagick-6.9.0.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.0.3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.0.3.ebuild?rev=1.1&content-type=text/plain

Index: imagemagick-6.9.0.3.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.0.3.ebuild,v 1.1 
2015/01/04 12:02:41 jlec Exp $

EAPI=5

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="http://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 ~x86-interix ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig 
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 
q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"

RESTRICT="perl? ( userpriv )"

# Drop the libtool dep once libltdl goes stable.
RDEPEND="
        || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
        autotrace? ( >=media-gfx/autotrace-0.31.1 )
        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-proto/xextproto )"

REQUIRED_USE="corefonts? ( truetype )
        test? ( corefonts )"

S=${WORKDIR}/${MY_P}

src_prepare() {
        epatch_user

        elibtoolize # for Darwin modules

        # For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3
        shopt -s nullglob
        mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
        if test -n "${mesa_cards}"; then
                addpredict "${mesa_cards}"
        fi
        ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
        if test -n "${ati_cards}"; then
                addpredict "${ati_cards}"
        fi
        shopt -u nullglob
        addpredict /dev/nvidiactl
}

src_configure() {
        local depth=16
        use q8 && depth=8
        use q32 && depth=32
        use q64 && depth=64

        local openmp=disable
        use openmp && { tc-has-openmp && openmp=enable; }

        [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket

        CONFIG_SHELL=$(type -P bash) \
        econf \
                $(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) \
                $(use_with 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) \
                --without-lcms \
                $(use_with lcms lcms2) \
                $(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
}

src_test() {
        
LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs"
 \
        emake -j1 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/ati/card:/dev/dri/card"
                EOF

                insinto /etc/sandbox.d
                doins "${T}"/99${PN} #472766
        fi

        insinto /usr/share/${PN}
        doins config/*icm
}




Reply via email to