monsieurp    14/12/18 20:24:34

  Modified:             imaging-1.1.7-r4.ebuild ChangeLog
  Added:                imaging-1.1.7-r5.ebuild
  Log:
  Add patch to avoid launching multiple image viewers. Fix bug 353153.
  
  (Portage version: 2.2.8-r2/cvs/Linux i686, unsigned Manifest commit)

Revision  Changes    Path
1.5                  dev-python/imaging/imaging-1.1.7-r4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild?r1=1.4&r2=1.5

Index: imaging-1.1.7-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- imaging-1.1.7-r4.ebuild     30 Jul 2014 01:21:21 -0000      1.4
+++ imaging-1.1.7-r4.ebuild     18 Dec 2014 20:24:34 -0000      1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.4 
2014/07/30 01:21:21 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.5 
2014/12/18 20:24:34 monsieurp Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -42,6 +42,7 @@
                "${FILESDIR}/${P}-giftrans.patch"
                "${FILESDIR}/${P}-missing-math.patch"
                "${FILESDIR}/${P}-ft-header-include.patch"
+               "${FILESDIR}/${P}-dont-run-multiple-viewers.patch"
        )
 
        # Add shebangs.



1.93                 dev-python/imaging/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.93&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.93&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.92&r2=1.93

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog   30 Jul 2014 01:21:21 -0000      1.92
+++ ChangeLog   18 Dec 2014 20:24:34 -0000      1.93
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.92 
2014/07/30 01:21:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.93 
2014/12/18 20:24:34 monsieurp Exp $
+
+*imaging-1.1.7-r5 (18 Dec 2014)
+
+  18 Dec 2014; Patrice Clement <[email protected]>
+  +files/imaging-1.1.7-dont-run-multiple-viewers.patch,
+  +imaging-1.1.7-r5.ebuild, imaging-1.1.7-r4.ebuild:
+  Add patch to avoid launching multiple image viewers. Fix bug 353153.
 
   30 Jul 2014; Mike Frysinger <[email protected]>
   +files/imaging-1.1.7-ft-header-include.patch, imaging-1.1.7-r4.ebuild:



1.1                  dev-python/imaging/imaging-1.1.7-r5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild?rev=1.1&content-type=text/plain

Index: imaging-1.1.7-r5.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 
1.1 2014/12/18 20:24:34 monsieurp Exp $

EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_REQ_USE='tk?'

inherit distutils-r1

MY_P=Imaging-${PV}

DESCRIPTION="Python Imaging Library (PIL)"
HOMEPAGE="http://www.pythonware.com/products/pil/index.htm";
SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz";

LICENSE="HPND"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="doc examples jpeg lcms scanner test tiff tk truetype zlib"

RDEPEND="
        truetype? ( media-libs/freetype:2 )
        jpeg? ( virtual/jpeg )
        lcms? ( media-libs/lcms:0 )
        scanner? ( media-gfx/sane-backends )
        tiff? ( media-libs/tiff )
        zlib? ( sys-libs/zlib )
        !dev-python/pillow"
DEPEND="${RDEPEND}"
RDEPEND+=" !dev-python/pillow"

# Tests don't handle missing jpeg, tiff & zlib properly.
REQUIRED_USE="test? ( jpeg tiff zlib )"

S="${WORKDIR}/${MY_P}"

python_prepare_all() {
        local PATCHES=(
                "${FILESDIR}/${P}-no-xv.patch"
                "${FILESDIR}/${P}-sane.patch"
                "${FILESDIR}/${P}-giftrans.patch"
                "${FILESDIR}/${P}-missing-math.patch"
                "${FILESDIR}/${P}-ft-header-include.patch"
                "${FILESDIR}/${P}-dont-run-multiple-viewers.patch"
        )

        # Add shebangs.
        sed -e "1i#!/usr/bin/env python" -i Scripts/*.py || die

        # Disable all the stuff we don't want.
        local f
        for f in jpeg lcms tiff tk zlib; do
                if ! use ${f}; then
                        sed -i -e "s:feature.${f} =:& None #:" setup.py || die
                fi
        done
        if ! use truetype; then
                sed -i -e 's:feature.freetype =:& None #:' setup.py || die
        fi

        distutils-r1_python_prepare_all
}

# XXX: split into two ebuilds?
wrap_phase() {
        "${@}"

        if use scanner; then
                cd Sane || die
                "${@}"
        fi
}

python_compile() {
        wrap_phase distutils-r1_python_compile
}

python_test() {
        "${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
}

python_install() {
        python_doheader libImaging/{Imaging.h,ImPlatform.h}

        wrap_phase distutils-r1_python_install
}

python_install_all() {
        use doc && local HTML_DOCS=( Docs/. )
        use examples && local EXAMPLES=( Scripts/. )

        distutils-r1_python_install_all

        if use scanner; then
                docinto sane
                dodoc Sane/{CHANGES,README,sanedoc.txt}
        fi

        if use examples && use scanner; then
                docinto examples/sane
                dodoc Sane/demo_*.py
                docompress -x /usr/share/${PF}/examples
        fi
}




Reply via email to