Version BUmp, with fix for CVE-2014-9601, #534748; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/dev-python/pillow/ChangeLog b/dev-python/pillow/ChangeLog
index 131ceae7c89cc75433dd391dc56cf235e941c4ab..1dfd43fd7a2963c926168c73178d78aa09603a86 100644 (file)
--- a/dev-python/pillow/ChangeLog
+++ b/dev-python/pillow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pillow
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.46 2014/11/02 09:04:40 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.47 2015/04/03 19:39:54 jlec Exp $
+
+*pillow-2.8.1 (03 Apr 2015)
+
+  03 Apr 2015; Justin Lecher <jlec@gentoo.org> +pillow-2.8.1.ebuild,
+  -pillow-2.4.0-r1.ebuild, metadata.xml:
+  Version BUmp, with fix for CVE-2014-9601, #534748; drop old
 
   02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> pillow-2.5.3-r1.ebuild:
   Stable for alpha, wrt bug #522426

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index a29b6ff483b95c90e36a888d992a57d45175c8c0..60bff64f448d211961256574a4ecf070816df46d 100644 (file)
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,30 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX imaging-1.1.7-no-xv.patch 691 SHA256 d692f9085fefb06559ee63628852ce72a498657bccdd3ba500e8278ae22b145a SHA512 8a42a75a198ae9da4875e23fd26a834e5fb2209b1e6f67a99d6d14e02cd3ea5e1020d46c3a75df9442eea761de8f8e999551a1af45f2496b5f70fb3fafc80e5c WHIRLPOOL a1cced6e904e75b89abeb6d47b07dc2b33a43e3044d7f7243bd906647020ef42c588eb415f5e81344f5aede0dfa49a31405431d314a35cf37d43b5a7050280bf
 AUX pillow-2.0.0-delete_hardcoded_paths.patch 7309 SHA256 400cb4029d59e6f80aea05051f10cedbb9937ce043ab764f8dfad845cfbabf72 SHA512 add72ba5df003162b29a0b034edc24bd18505ecd09ee80cc2ad7606a00e25f7918bf30bc1749961de341920c3b24743baffe16e6cf6060bf4a4fad6ca8b564ce WHIRLPOOL 43045044d725060c12cfe214154a27332756e5d0c4a9bae3ad792ca94d7107932cf61159af8bb3deaff9f5e104006f1fd28163a051b4465cc42d61d303c672a1
 AUX pillow-2.0.0-libm_linking.patch 598 SHA256 eea0a0d0edc0d4392ce6ef04d400f53cfee63d7093e4ee368ad491e5a5d2c872 SHA512 ab64b551e2782ab9537c826ea1237da4a38f897d14ee8d87e39e74108f6403ce20f86d133c09ef51b920b4395a9ef68af686b19b505174a5c6f6cf0c7e2d6572 WHIRLPOOL 921c536f7ea50c779bd2c93ed07c00c69116af16861ae30f2cd4010a524c2bd79711e1ad92ade0159ec25425bc8c5b4e6b65bdbef86d99cd47fd504e20106523
 AUX pillow-freetype-2.5.1.patch 658 SHA256 1e283f0ee8bef9fc1bdc5e34885be8da7e246e348183a4cabc681f779f0eea65 SHA512 7868690d92ff5721b5c5ee9e1dd4741d47f2077d13fc96c3763e9a132151c787c4a55c8281998a81c2ca2d0a76cc4852091c8af083f84e48bca8bf169b831faf WHIRLPOOL de55a2214b39b8bcd95d56b798702adcd1889c859f849431ac3fe92c30837ed8a425462a2e0335a788ab17eed4c9d60591c446c518bb20f94cb070ecec3d068c
-DIST Pillow-2.4.0.zip 6519873 SHA256 2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a SHA512 8eaf087dd30f02792398d8b219a829289776c26cf014fbce6658f355e07548abec67c4e1f1203d58b938a86bdce17ceb3764b2024e095f894fc06caf05c99789 WHIRLPOOL 89ae9858a4ae44f78993036c245f4660ab0d6dc38deb91b8bc5ecc20af8ed1069af891da18d615590debbb0125b5b6e495f3a1ac7912d09c2ec5085277f73c5b
 DIST Pillow-2.5.3.zip 6873222 SHA256 62ff6c6cb88d4a1d6e856315b1691186b06cb923f18fde86d6abac9eeb9096d1 SHA512 09d8cb9391f1627e01898eef15109ddd1deecc0bcd342f35e85b7cc0eacc61952ed8c297c460b858815d05ed9ab65c3674ef1c4b73d583ff37fd7eed7368af35 WHIRLPOOL 99f8bd559eaad619db872bb29673abd0073dc5e3f4f85056e51a4e59c5e85193de10934e4b725ef9b40af535c8dac7128debf441982fa3a2355411944d495527
-EBUILD pillow-2.4.0-r1.ebuild 2636 SHA256 84e3b27b8dab7fab9f5095fa93f39a96cb6e5dd219b9e036d46b882a5c4bfe99 SHA512 4df6bf8fbfe9fe541978ef79ed2294d1e2679e140a056e8281cbc0d601eab259e47935ebea411b7296b75d59cb1cf6afe653bda7b47787f1f2eca11abe16e442 WHIRLPOOL 6fb6085afc1b47664af3a2d36ae58d49545289a07314be0bd3ade6552f09cba75745927593af4f9c824c67ea6d341a3bcb4b11b32c93778f2d62f1802b70e853
+DIST Pillow-2.8.1.zip 9275663 SHA256 4363b52527c263e77f5b18c3dfffd15ae454edf0c4457197ecbe29863a651938 SHA512 75c0cfb53530549a2bac66cc3457747c239779233c64fe944fa661e7401acd915700e0dfd74e13c93d96afb9b50a112f09cbaea49205e83d8797e832a52534e4 WHIRLPOOL e71a39be415c2b83b7d554af7ad86652c08594c302344c919352a64ca48cfc7c1a88ca8dacccdacb283d8a42ad14cd3cb230c2900a9f11dc31ad20e203d6596d
 EBUILD pillow-2.5.3-r1.ebuild 2637 SHA256 5daccfb6acdd2f754e70fa601172e93e6da1b8e5534f98cac24cd98cae0e14a9 SHA512 82b651bc3bb11c8c35682b92def2b7bafe542d87a458214faec016b04698118dcd5d001353dce68a3a9e6a94897bdcdbb997ca1b64fd8cc7278c7a5faa7f0325 WHIRLPOOL 916cd74cc7d2f1eb9f8e0ca2784b1231f13c2b87728fd76ce7570c1317f77701dd0fe630be5b601fd873f168d6b930b2acf8bcebe6846ec1bde8310417f0901b
-MISC ChangeLog 5976 SHA256 95c67349a3f00c1c0d78910a1ed7b5f1831d4dec05c17ab46436a6aaba974daa SHA512 672bad36125a99542eea8e7b84eccda1d755820c696842f3fb8009754c21e42ace69ff933663e13b701e5a16a14c51b60f69364bddca653f4a1b0830a6dd0a6b WHIRLPOOL c0367a9f14a72ce9790a41ab4e98e42ad6c7073752b4e4697252cdf03e8ce2f8831206a6c925c679dee2df626d38ea882dd3144e589884674bfd48ca30c2c4fe
-MISC metadata.xml 240 SHA256 c074ff55f0a36445f041979a1f7ed66e1993313aad3d5a5e4f202dc842de7831 SHA512 837f01165c567829d1e8fab358907f8239042976a9f44a6cd0a7fd37070a8b5c275a2ddf836d9967c948c049927264eac917aae6093300258db319d5051c9769 WHIRLPOOL 4d7615634e94a9dd43de3945018123529c92576b4f0298500fa728204540f7ae1e8e618fa838ae34852f336a28771fc89a7bb3b18a7819ae3da061f1afdab1b5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUVfOpAAoJELp701BxlEWfukQP/j1BhxpZrQiJZcVCRAvHJmsp
-CSqWac5k++r2h2byji7VNQsQtsBrf+ztQGOfvWBYD8K/UMXkJ+RkFChsml1dTmom
-eTiS+8xUc+jyTqe7FdZjRN2si3JDtOaXsNHQWjJ5602wDmUIxZ4za2d79HNdvJUf
-7YE+/X8/4VuvP3thS6Z+7uL/9UPOQbP+zH7Cz9gEbw/vwt2JTLtrO4n5AvS5mXgV
-tSNr1bzO3cDJ6QPmTSR9BOSWe8U92NoVB0j0jTBQ5wAnRwNI6LSOLck/JgqtM1+b
-whmliRwdBue657d6yG3XaE0l93UESRE2hYz5QQ2De9zbQUXp+YGZGGFh+Xjb8Ki0
-HXiNWpoJx9VqKsxAp/JmZUagLeVojm8u8cFAEmxnCt7XM9im91z7dLW0dQRUIm4u
-/Rr0nTXG5hAOgnEdZUiAOCIHV5MhXqwVpPajinOHboISTabRiqBUJaCC9VdRnkbm
-s8JjcDbSeVwY2MsTmIFOw7XmdMQpognoeGJSVk71lf4vNOjptcWJ4xStYLvTnLlC
-OcNw+ksdQDbkFz6C2VlKx07NkYMPnnpHwpqnuom6bXRo9U+ZNGtGohKz8CH/ceWu
-HFuO2Wt3jbebsZOkYDY5HaTYzYATCi4qjknEzurE2H31C+3b1CH038B90j42uYsX
-fP1iqTHbncjtXWEMVdGT
-=34HT
------END PGP SIGNATURE-----
+EBUILD pillow-2.8.1.ebuild 2237 SHA256 306671559f95123d4fc0217fe9f1a93db9b67e246631abf8bbd8666ead15b229 SHA512 c8b269fc22b3df8773029250674bffa2e1869d0b0ac06ada772cd98949c7db4cc5d3c4e0cf7223f61f0d62cc5dfeaa3076fec85d6f29a03449a8c106bcf41b2d WHIRLPOOL fc708ffe04e74a608a540209963ea112fef65012bd166ba7589efd7e47eee7a62b1f9776928260c5fa454ad6080866fd36ea23b03004ac196d378af9a5fc7688
+MISC ChangeLog 6179 SHA256 aadba6df413466ff74005718c5d90797a7e9e682a20d8e6420a8a1fc22773784 SHA512 9dcf56c9b2ffa7cc525ddb133b6f206f8b4b723f28cdaf8260778ad18f00985f679028e2d5e1324cd8ea278a83aeb3d58c3c66801f871ba32749d103abe231c2 WHIRLPOOL 652e5c0ccefcc36862d12c91aba43fa5d5dcfb69bff440f7d85b35e12d71fc36cab811eea4e7dccf4e66a564ed60ad590e79415e37fb6ef4e3435668f2cd0b67
+MISC metadata.xml 245 SHA256 1f9c94139e524aa8fd2a26a21d363b4a3b85dfd838a601d63b7643bda353ca9d SHA512 a528e3bbc0c0908eb1318e977b9461e8f0dc718b569cd51c33a7cd4ed2dec08d0ee5654bf0e2582c3784f1156140373098dbe9c2e6e94ea8f39f446535d5796c WHIRLPOOL d758aef58f9af4f3f06e51998ee3e78a3ec9dff1557ba35e06a1e4057085a54d3f0ba0ad86d9b3abc723a3b4608565ffa328b0351ff1d2179519c4dc173e7ced

diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index 338413c17e70d8bcdc865154e7350bfc087ff48e..faafd7e01e6ebddb9c04a6f1db528ea3d877f2c5 100644 (file)
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>python</herd>
-       <use>
-               <flag name='webp'>Enable support for webp image format.</flag>
-       </use>
+  <herd>python</herd>
+  <use>
+    <flag name="webp">Enable support for webp image format.</flag>
+  </use>
 </pkgmetadata>

diff --git a/dev-python/pillow/pillow-2.4.0-r1.ebuild b/dev-python/pillow/pillow-2.8.1.ebuild
similarity index 62%
rename from dev-python/pillow/pillow-2.4.0-r1.ebuild
rename to dev-python/pillow/pillow-2.8.1.ebuild
index cce5de95d38b550869703c631d4b10aac53dd68c..33fcdafb17abbf585b2f332875bd8cae68752a16 100644 (file)
--- a/dev-python/pillow/pillow-2.4.0-r1.ebuild
+++ b/dev-python/pillow/pillow-2.8.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.4.0-r1.ebuild,v 1.1 2014/10/26 03:08:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.8.1.ebuild,v 1.1 2015/04/03 19:39:54 jlec Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 PYTHON_REQ_USE='tk?'
 
 inherit distutils-r1 eutils
@@ -17,17 +18,17 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 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 jpeg2k lcms scanner test tiff tk truetype webp zlib"
+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 jpeg2k lcms test tiff tk truetype webp zlib"
+
 REQUIRED_USE="test? ( jpeg )"
 
 RDEPEND="
-       truetype? ( media-libs/freetype:2= )
        jpeg? ( virtual/jpeg:0 )
        jpeg2k? ( media-libs/openjpeg:2= )
        lcms? ( media-libs/lcms:2= )
-       scanner? ( media-gfx/sane-backends:0= )
        tiff? ( media-libs/tiff:0= )
+       truetype? ( media-libs/freetype:2= )
        webp? ( media-libs/libwebp:0= )
        zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
@@ -62,33 +63,19 @@ python_prepare_all() {
        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_compile_all() {
        use doc && emake -C docs html
 }
 
 python_test() {
-       "${PYTHON}" selftest.py --installed || die "Tests fail with ${EPYTHON}"
-       "${PYTHON}" Tests/run.py --installed || die "Tests fail with ${EPYTHON}"
+       "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+       nosetests -vx Tests/test_*.py || die "Testing failed with ${EPYTHON}"
 }
 
 python_install() {
        python_doheader libImaging/{Imaging.h,ImPlatform.h}
 
-       wrap_phase distutils-r1_python_install
+       distutils-r1_python_install
 }
 
 python_install_all() {
@@ -96,14 +83,4 @@ python_install_all() {
        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
-       fi
 }