From 609cfd6aebbde8bca31005b4915067ed59429ea4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 28 Mar 2012 18:46:08 -0400 Subject: [PATCH] imaging: update to latest stable Needed for newer jpeg virtual. BUG=chromium-os:25177 TEST=`emerge imaging` worked -- this package is only installed in cros-sdk Change-Id: I8b6e336a74ce5ea2ba6f3168d589b498708ee270 Reviewed-on: https://gerrit.chromium.org/gerrit/20511 Reviewed-by: David James Tested-by: Mike Frysinger Commit-Ready: Mike Frysinger --- .../imaging/files/imaging-1.1.7-nolcms.patch | 13 ++++ ...g-1.1.7.ebuild => imaging-1.1.7-r1.ebuild} | 70 ++++++++++++------- 2 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/imaging/files/imaging-1.1.7-nolcms.patch rename sdk_container/src/third_party/portage-stable/dev-python/imaging/{imaging-1.1.7.ebuild => imaging-1.1.7-r1.ebuild} (53%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/imaging/files/imaging-1.1.7-nolcms.patch b/sdk_container/src/third_party/portage-stable/dev-python/imaging/files/imaging-1.1.7-nolcms.patch new file mode 100644 index 0000000000..e087cd301d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/imaging/files/imaging-1.1.7-nolcms.patch @@ -0,0 +1,13 @@ +--- setup.py.orig ++++ setup.py 2011-09-04 +@@ -264,10 +264,6 @@ + if dir: + add_directory(self.compiler.include_dirs, dir, 0) + +- if find_include_file(self, "lcms.h"): +- if find_library_file(self, "lcms"): +- feature.lcms = "lcms" +- + if _tkinter and find_include_file(self, "tk.h"): + # the library names may vary somewhat (e.g. tcl84 or tcl8.4) + version = TCL_VERSION[0] + TCL_VERSION[2] diff --git a/sdk_container/src/third_party/portage-stable/dev-python/imaging/imaging-1.1.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/imaging/imaging-1.1.7-r1.ebuild similarity index 53% rename from sdk_container/src/third_party/portage-stable/dev-python/imaging/imaging-1.1.7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/imaging/imaging-1.1.7-r1.ebuild index 501cd3abd9..7e4a0c1a4b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/imaging/imaging-1.1.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/imaging/imaging-1.1.7-r1.ebuild @@ -1,11 +1,15 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 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.ebuild,v 1.8 2010/03/07 12:51:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.10 2012/04/17 21:57:44 ranger Exp $ -EAPI="2" +EAPI="3" +PYTHON_DEPEND="2" +PYTHON_USE_WITH="tk" +PYTHON_USE_WITH_OPT="tk" SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" -inherit eutils distutils +inherit eutils multilib distutils MY_P=Imaging-${PV} @@ -15,30 +19,45 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz" LICENSE="as-is" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="doc examples scanner tk X" +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 lcms scanner tk X" -DEPEND="media-libs/jpeg:0 +DEPEND="virtual/jpeg media-libs/freetype:2 - tk? ( dev-lang/python[tk?] ) + lcms? ( media-libs/lcms:0 ) scanner? ( media-gfx/sane-backends ) X? ( x11-misc/xdg-utils )" RDEPEND="${DEPEND}" -RESTRICT_PYTHON_ABIS="3*" - -PYTHON_MODNAME=PIL S="${WORKDIR}/${MY_P}" +DOCS="CHANGES CONTENTS" + +pkg_setup() { + PYTHON_MODNAME="PIL $(use scanner && echo sane.py)" + python_pkg_setup +} + src_prepare() { - epatch "${FILESDIR}"/${P}-no-xv.patch - epatch "${FILESDIR}"/${P}-sane.patch - epatch "${FILESDIR}"/${P}-giftrans.patch - epatch "${FILESDIR}"/${P}-missing-math.patch + distutils_src_prepare + + epatch "${FILESDIR}/${P}-no-xv.patch" + epatch "${FILESDIR}/${P}-sane.patch" + epatch "${FILESDIR}/${P}-giftrans.patch" + epatch "${FILESDIR}/${P}-missing-math.patch" + if ! use lcms; then + epatch "${FILESDIR}/${P}-nolcms.patch" + fi + + # Add shebang. + sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \ + || die "sed failed adding shebang" + sed -i \ -e "s:/usr/lib\":/usr/$(get_libdir)\":" \ -e "s:\"lib\":\"$(get_libdir)\":g" \ setup.py || die "sed failed" + if ! use tk; then # Make the test always fail sed -i \ @@ -49,9 +68,11 @@ src_prepare() { src_compile() { distutils_src_compile + if use scanner; then - cd "${S}/Sane" + pushd Sane > /dev/null distutils_src_compile + popd > /dev/null fi } @@ -63,17 +84,17 @@ src_test() { } src_install() { - local DOCS="CHANGES CONTENTS" distutils_src_install - use doc && dohtml Docs/* + if use doc; then + dohtml Docs/* || die "dohtml failed" + fi if use scanner; then - cd "${S}/Sane" + pushd Sane > /dev/null docinto sane - local DOCS="CHANGES sanedoc.txt" - distutils_src_install - cd "${S}" + DOCS="CHANGES sanedoc.txt" distutils_src_install + popd > /dev/null fi # Install headers required by media-gfx/sketch. @@ -86,10 +107,11 @@ src_install() { if use examples; then insinto /usr/share/doc/${PF}/examples - doins Scripts/* + doins Scripts/* || die "doins failed" + if use scanner; then insinto /usr/share/doc/${PF}/examples/sane - doins Sane/demo_*.py + doins Sane/demo_*.py || die "doins failed" fi fi }