Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/imaging: imaging-1.1.7-r5.ebuild imaging-1.1.7-r2.ebuild imaging-1.1.7-r1.ebuild ChangeLog imaging-1.1.7-r4.ebuild
Date: Tue, 30 Dec 2014 18:23:22
Message-Id: 20141230182318.97AEDE828@oystercatcher.gentoo.org
1 floppym 14/12/30 18:23:18
2
3 Modified: imaging-1.1.7-r5.ebuild imaging-1.1.7-r2.ebuild
4 imaging-1.1.7-r1.ebuild ChangeLog
5 Removed: imaging-1.1.7-r4.ebuild
6 Log:
7 Drop lcms support, bug 526808.
8
9 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
10
11 Revision Changes Path
12 1.2 dev-python/imaging/imaging-1.1.7-r5.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild?r1=1.1&r2=1.2
17
18 Index: imaging-1.1.7-r5.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- imaging-1.1.7-r5.ebuild 18 Dec 2014 20:24:34 -0000 1.1
25 +++ imaging-1.1.7-r5.ebuild 30 Dec 2014 18:23:18 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2014 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $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 $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 1.2 2014/12/30 18:23:18 floppym Exp $
31
32 EAPI=5
33 PYTHON_COMPAT=( python{2_6,2_7} )
34 @@ -17,12 +17,11 @@
35 LICENSE="HPND"
36 SLOT="0"
37 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
38 -IUSE="doc examples jpeg lcms scanner test tiff tk truetype zlib"
39 +IUSE="doc examples jpeg scanner test tiff tk truetype zlib"
40
41 RDEPEND="
42 truetype? ( media-libs/freetype:2 )
43 jpeg? ( virtual/jpeg )
44 - lcms? ( media-libs/lcms:0 )
45 scanner? ( media-gfx/sane-backends )
46 tiff? ( media-libs/tiff )
47 zlib? ( sys-libs/zlib )
48 @@ -50,7 +49,7 @@
49
50 # Disable all the stuff we don't want.
51 local f
52 - for f in jpeg lcms tiff tk zlib; do
53 + for f in jpeg tiff tk zlib; do
54 if ! use ${f}; then
55 sed -i -e "s:feature.${f} =:& None #:" setup.py || die
56 fi
57 @@ -58,6 +57,7 @@
58 if ! use truetype; then
59 sed -i -e 's:feature.freetype =:& None #:' setup.py || die
60 fi
61 + sed -i -e "s:feature.lcms =:& None #:" setup.py || die
62
63 distutils-r1_python_prepare_all
64 }
65
66
67
68 1.7 dev-python/imaging/imaging-1.1.7-r2.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild?rev=1.7&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild?rev=1.7&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild?r1=1.6&r2=1.7
73
74 Index: imaging-1.1.7-r2.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v
77 retrieving revision 1.6
78 retrieving revision 1.7
79 diff -u -r1.6 -r1.7
80 --- imaging-1.1.7-r2.ebuild 5 Sep 2013 18:46:38 -0000 1.6
81 +++ imaging-1.1.7-r2.ebuild 30 Dec 2014 18:23:18 -0000 1.7
82 @@ -1,6 +1,6 @@
83 -# Copyright 1999-2013 Gentoo Foundation
84 +# Copyright 1999-2014 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.6 2013/09/05 18:46:38 mgorny Exp $
87 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.7 2014/12/30 18:23:18 floppym Exp $
88
89 EAPI=5
90 PYTHON_COMPAT=( python{2_6,2_7} )
91 @@ -17,11 +17,10 @@
92 LICENSE="HPND"
93 SLOT="0"
94 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
95 -IUSE="doc examples lcms scanner tk X"
96 +IUSE="doc examples scanner tk X"
97
98 DEPEND="virtual/jpeg
99 media-libs/freetype:2
100 - lcms? ( media-libs/lcms:0 )
101 scanner? ( media-gfx/sane-backends )
102 X? ( x11-misc/xdg-utils )"
103 RDEPEND="${DEPEND}"
104 @@ -35,10 +34,9 @@
105 "${FILESDIR}/${P}-sane.patch"
106 "${FILESDIR}/${P}-giftrans.patch"
107 "${FILESDIR}/${P}-missing-math.patch"
108 + "${FILESDIR}/${P}-nolcms.patch"
109 )
110
111 - use lcms || PATCHES+=( "${FILESDIR}/${P}-nolcms.patch" )
112 -
113 # Add shebang.
114 sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \
115 || die "sed failed adding shebang"
116
117
118
119 1.14 dev-python/imaging/imaging-1.1.7-r1.ebuild
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild?rev=1.14&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild?rev=1.14&content-type=text/plain
123 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild?r1=1.13&r2=1.14
124
125 Index: imaging-1.1.7-r1.ebuild
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v
128 retrieving revision 1.13
129 retrieving revision 1.14
130 diff -u -r1.13 -r1.14
131 --- imaging-1.1.7-r1.ebuild 28 May 2013 22:47:40 -0000 1.13
132 +++ imaging-1.1.7-r1.ebuild 30 Dec 2014 18:23:18 -0000 1.14
133 @@ -1,6 +1,6 @@
134 -# Copyright 1999-2013 Gentoo Foundation
135 +# Copyright 1999-2014 Gentoo Foundation
136 # Distributed under the terms of the GNU General Public License v2
137 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.13 2013/05/28 22:47:40 floppym Exp $
138 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.14 2014/12/30 18:23:18 floppym Exp $
139
140 EAPI="3"
141 PYTHON_DEPEND="2"
142 @@ -20,11 +20,10 @@
143 LICENSE="HPND"
144 SLOT="0"
145 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
146 -IUSE="doc examples lcms scanner tk X"
147 +IUSE="doc examples scanner tk X"
148
149 DEPEND="virtual/jpeg
150 media-libs/freetype:2
151 - lcms? ( media-libs/lcms:0 )
152 scanner? ( media-gfx/sane-backends )
153 X? ( x11-misc/xdg-utils )"
154 RDEPEND="${DEPEND}"
155 @@ -46,9 +45,7 @@
156 epatch "${FILESDIR}/${P}-sane.patch"
157 epatch "${FILESDIR}/${P}-giftrans.patch"
158 epatch "${FILESDIR}/${P}-missing-math.patch"
159 - if ! use lcms; then
160 - epatch "${FILESDIR}/${P}-nolcms.patch"
161 - fi
162 + epatch "${FILESDIR}/${P}-nolcms.patch"
163
164 # Add shebang.
165 sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \
166
167
168
169 1.95 dev-python/imaging/ChangeLog
170
171 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.95&view=markup
172 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.95&content-type=text/plain
173 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.94&r2=1.95
174
175 Index: ChangeLog
176 ===================================================================
177 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
178 retrieving revision 1.94
179 retrieving revision 1.95
180 diff -u -r1.94 -r1.95
181 --- ChangeLog 18 Dec 2014 20:30:01 -0000 1.94
182 +++ ChangeLog 30 Dec 2014 18:23:18 -0000 1.95
183 @@ -1,6 +1,10 @@
184 # ChangeLog for dev-python/imaging
185 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
186 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.94 2014/12/18 20:30:01 monsieurp Exp $
187 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.95 2014/12/30 18:23:18 floppym Exp $
188 +
189 + 30 Dec 2014; Mike Gilbert <floppym@g.o> -imaging-1.1.7-r4.ebuild,
190 + imaging-1.1.7-r1.ebuild, imaging-1.1.7-r2.ebuild, imaging-1.1.7-r5.ebuild:
191 + Drop lcms support, bug 526808.
192
193 18 Dec 2014; Patrice Clement <monsieurp@g.o> imaging-1.1.7-r4.ebuild:
194 Added fix to -r4 file accidentally. Removing it.
Report Message
Find on MARC Find on Google Groups