From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 666F0138ACE for ; Tue, 11 Nov 2014 08:30:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A3E9E0A7F; Tue, 11 Nov 2014 08:30:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DE9F3E0A7E for ; Tue, 11 Nov 2014 08:30:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75B2C340548 for ; Tue, 11 Nov 2014 08:30:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB9939E7C for ; Tue, 11 Nov 2014 08:30:21 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1415694371.7a52bbfa08cb0eae4e5071b0052c5e693245c0cc.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/mgltools-dejavu/files/, sci-chemistry/mgltools-dejavu/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/mgltools-dejavu/ChangeLog sci-chemistry/mgltools-dejavu/files/mgltools-dejavu-1.5.6-pil.patch sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6-r1.ebuild X-VCS-Directories: sci-chemistry/mgltools-dejavu/ sci-chemistry/mgltools-dejavu/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 7a52bbfa08cb0eae4e5071b0052c5e693245c0cc X-VCS-Branch: master Date: Tue, 11 Nov 2014 08:30:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c8418db6-73fb-4b32-b504-840f78e4918a X-Archives-Hash: 20ae6ba2a94a90e0ab22554a0edbe115 commit: 7a52bbfa08cb0eae4e5071b0052c5e693245c0cc Author: Justin Lecher gentoo org> AuthorDate: Tue Nov 11 08:26:11 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Nov 11 08:26:11 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a52bbfa sci-chemistry/mgltools-dejavu: Add PIL fix Package-Manager: portage-2.2.14 --- sci-chemistry/mgltools-dejavu/ChangeLog | 8 +++- .../files/mgltools-dejavu-1.5.6-pil.patch | 43 +++++++++++++++++++ .../mgltools-dejavu-1.5.6-r1.ebuild | 50 ++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletion(-) diff --git a/sci-chemistry/mgltools-dejavu/ChangeLog b/sci-chemistry/mgltools-dejavu/ChangeLog index 3935600..ca71dd1 100644 --- a/sci-chemistry/mgltools-dejavu/ChangeLog +++ b/sci-chemistry/mgltools-dejavu/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-chemistry/mgltools-dejavu -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*mgltools-dejavu-1.5.6-r1 (11 Nov 2014) + + 11 Nov 2014; Justin Lecher + +mgltools-dejavu-1.5.6-r1.ebuild, +files/mgltools-dejavu-1.5.6-pil.patch: + Add PIL fix + 10 Jun 2013; Justin Lecher -mgltools-dejavu-1.5.4-r1.ebuild, mgltools-dejavu-1.5.6.ebuild: Drop old diff --git a/sci-chemistry/mgltools-dejavu/files/mgltools-dejavu-1.5.6-pil.patch b/sci-chemistry/mgltools-dejavu/files/mgltools-dejavu-1.5.6-pil.patch new file mode 100644 index 0000000..0ac1abd --- /dev/null +++ b/sci-chemistry/mgltools-dejavu/files/mgltools-dejavu-1.5.6-pil.patch @@ -0,0 +1,43 @@ + DejaVu/Camera.py | 12 +++++++++--- + DejaVu/Texture.py | 5 ++++- + 2 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/DejaVu/Camera.py b/DejaVu/Camera.py +index 9ecc0eb..555666a 100644 +--- a/DejaVu/Camera.py ++++ b/DejaVu/Camera.py +@@ -38,9 +38,15 @@ This Module implements the Camera class and the Fog class. + + import os, sys, warnings + +-import Image +-import ImageFilter +-import ImageChops ++try: ++ import Image ++ import ImageFilter ++ import ImageChops ++except ImportError: ++ from PIL import Image ++ from PIL import ImageFilter ++ from PIL import ImageChops ++ + + import tkMessageBox + +diff --git a/DejaVu/Texture.py b/DejaVu/Texture.py +index dccc280..bcf16be 100644 +--- a/DejaVu/Texture.py ++++ b/DejaVu/Texture.py +@@ -15,7 +15,10 @@ + # + + import sys, os +-import Image ++try: ++ import Image ++except ImportError: ++ from PIL import Image + import numpy.oldnumeric as Numeric + import warnings + diff --git a/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6-r1.ebuild b/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6-r1.ebuild new file mode 100644 index 0000000..07a346f --- /dev/null +++ b/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="tk" + +inherit distutils-r1 eutils + +MY_PN="DejaVu" +MY_P="${MY_PN}-${PV/_rc3/}" + +PYTHON_MODNAME="${MY_PN}" + +DESCRIPTION="MGLTools Plugin -- DejaVu" +HOMEPAGE="http://mgltools.scripps.edu" +SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz" + +LICENSE="MGLTOOLS MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-lang/swig" + +S="${WORKDIR}"/${MY_P} + +DOCS=( DejaVu/RELNOTES ) + +PATCHES=( "${FILESDIR}"/${P}-pil.patch ) + +src_unpack() { + tar xzpf "${DISTDIR}"/${A} mgltools_source_${PV/_/}/MGLPACKS/${MY_P}.tar.gz + tar xzpf mgltools_source_${PV/_/}/MGLPACKS/${MY_P}.tar.gz +} + +python_prepare_all() { + ecvs_clean + find "${S}" -name LICENSE -type f -delete || die + + sed \ + -e 's:^.*CVS:#&1:g' \ + -e 's:^.*LICENSE:#&1:g' \ + -i "${S}"/MANIFEST.in || die + distutils-r1_python_prepare_all +}