floppym 14/12/30 18:23:18
Modified: imaging-1.1.7-r5.ebuild imaging-1.1.7-r2.ebuild
imaging-1.1.7-r1.ebuild ChangeLog
Removed: imaging-1.1.7-r4.ebuild
Log:
Drop lcms support, bug 526808.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision Changes Path
1.2 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.2&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild?r1=1.1&r2=1.2
Index: imaging-1.1.7-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imaging-1.1.7-r5.ebuild 18 Dec 2014 20:24:34 -0000 1.1
+++ imaging-1.1.7-r5.ebuild 30 Dec 2014 18:23:18 -0000 1.2
@@ -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-r5.ebuild,v 1.1
2014/12/18 20:24:34 monsieurp Exp $
+# $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 $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,12 +17,11 @@
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"
+IUSE="doc examples jpeg 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 )
@@ -50,7 +49,7 @@
# Disable all the stuff we don't want.
local f
- for f in jpeg lcms tiff tk zlib; do
+ for f in jpeg tiff tk zlib; do
if ! use ${f}; then
sed -i -e "s:feature.${f} =:& None #:" setup.py || die
fi
@@ -58,6 +57,7 @@
if ! use truetype; then
sed -i -e 's:feature.freetype =:& None #:' setup.py || die
fi
+ sed -i -e "s:feature.lcms =:& None #:" setup.py || die
distutils-r1_python_prepare_all
}
1.7 dev-python/imaging/imaging-1.1.7-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild?rev=1.7&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild?r1=1.6&r2=1.7
Index: imaging-1.1.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- imaging-1.1.7-r2.ebuild 5 Sep 2013 18:46:38 -0000 1.6
+++ imaging-1.1.7-r2.ebuild 30 Dec 2014 18:23:18 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r2.ebuild,v 1.6
2013/09/05 18:46:38 mgorny Exp $
+# $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 $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,11 +17,10 @@
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 lcms scanner tk X"
+IUSE="doc examples scanner tk X"
DEPEND="virtual/jpeg
media-libs/freetype:2
- lcms? ( media-libs/lcms:0 )
scanner? ( media-gfx/sane-backends )
X? ( x11-misc/xdg-utils )"
RDEPEND="${DEPEND}"
@@ -35,10 +34,9 @@
"${FILESDIR}/${P}-sane.patch"
"${FILESDIR}/${P}-giftrans.patch"
"${FILESDIR}/${P}-missing-math.patch"
+ "${FILESDIR}/${P}-nolcms.patch"
)
- use lcms || PATCHES+=( "${FILESDIR}/${P}-nolcms.patch" )
-
# Add shebang.
sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \
|| die "sed failed adding shebang"
1.14 dev-python/imaging/imaging-1.1.7-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild?rev=1.14&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild?r1=1.13&r2=1.14
Index: imaging-1.1.7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- imaging-1.1.7-r1.ebuild 28 May 2013 22:47:40 -0000 1.13
+++ imaging-1.1.7-r1.ebuild 30 Dec 2014 18:23:18 -0000 1.14
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r1.ebuild,v 1.13
2013/05/28 22:47:40 floppym Exp $
+# $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 $
EAPI="3"
PYTHON_DEPEND="2"
@@ -20,11 +20,10 @@
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 lcms scanner tk X"
+IUSE="doc examples scanner tk X"
DEPEND="virtual/jpeg
media-libs/freetype:2
- lcms? ( media-libs/lcms:0 )
scanner? ( media-gfx/sane-backends )
X? ( x11-misc/xdg-utils )"
RDEPEND="${DEPEND}"
@@ -46,9 +45,7 @@
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
+ epatch "${FILESDIR}/${P}-nolcms.patch"
# Add shebang.
sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \
1.95 dev-python/imaging/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.95&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.95&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.94&r2=1.95
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog 18 Dec 2014 20:30:01 -0000 1.94
+++ ChangeLog 30 Dec 2014 18:23:18 -0000 1.95
@@ -1,6 +1,10 @@
# 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.94
2014/12/18 20:30:01 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.95
2014/12/30 18:23:18 floppym Exp $
+
+ 30 Dec 2014; Mike Gilbert <[email protected]> -imaging-1.1.7-r4.ebuild,
+ imaging-1.1.7-r1.ebuild, imaging-1.1.7-r2.ebuild, imaging-1.1.7-r5.ebuild:
+ Drop lcms support, bug 526808.
18 Dec 2014; Patrice Clement <[email protected]> imaging-1.1.7-r4.ebuild:
Added fix to -r4 file accidentally. Removing it.
