public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-python/imaging: imaging-1.1.7-r3.ebuild ChangeLog
@ 2013-04-21 20:33 Michal Gorny (mgorny)
  0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2013-04-21 20:33 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/04/21 20:33:22

  Modified:             ChangeLog
  Added:                imaging-1.1.7-r3.ebuild
  Log:
  Backport the ebuild improvements from dev-python/pillow. Remove unnecessary inherits. Add a fine-grained control over features, and a simpler feature switch mechanism. Remove unused USE=X, add shebangs to all Python scripts. Use the new python_doinclude function and EXAMPLES support.
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

Revision  Changes    Path
1.82                 dev-python/imaging/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.81&r2=1.82

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog	24 Feb 2013 12:15:03 -0000	1.81
+++ ChangeLog	21 Apr 2013 20:33:22 -0000	1.82
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.81 2013/02/24 12:15:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.82 2013/04/21 20:33:22 mgorny Exp $
+
+*imaging-1.1.7-r3 (21 Apr 2013)
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org> +imaging-1.1.7-r3.ebuild:
+  Backport the ebuild improvements from dev-python/pillow. Remove unnecessary
+  inherits. Add a fine-grained control over features, and a simpler feature
+  switch mechanism. Remove unused USE=X, add shebangs to all Python scripts. Use
+  the new python_doinclude function and EXAMPLES support.
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> imaging-1.1.7-r2.ebuild:
   Stable for x86, wrt bug #447470



1.1                  dev-python/imaging/imaging-1.1.7-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?rev=1.1&content-type=text/plain

Index: imaging-1.1.7-r3.ebuild
===================================================================
# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/04/21 20:33:22 mgorny Exp $

EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
PYTHON_REQ_USE='tk?'

inherit distutils-r1

MY_P=Imaging-${PV}

DESCRIPTION="Python Imaging Library (PIL)"
HOMEPAGE="http://www.pythonware.com/products/pil/index.htm"
SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"

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"

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 )
	!dev-python/pillow"
DEPEND="${RDEPEND}"

# Tests don't handle missing jpeg, tiff & zlib properly.
REQUIRED_USE="test? ( jpeg tiff zlib )"

S="${WORKDIR}/${MY_P}"

python_prepare_all() {
	local PATCHES=(
		"${FILESDIR}/${P}-no-xv.patch"
		"${FILESDIR}/${P}-sane.patch"
		"${FILESDIR}/${P}-giftrans.patch"
		"${FILESDIR}/${P}-missing-math.patch"
	)

	# Add shebangs.
	sed -e "1i#!/usr/bin/env python" -i Scripts/*.py || die

	# Disable all the stuff we don't want.
	local f
	for f in jpeg lcms tiff tk zlib; do
		if ! use ${f}; then
			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
		fi
	done
	if ! use truetype; then
		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
	fi

	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_test() {
	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
}

python_install() {
	python_doheader libImaging/{Imaging.h,ImPlatform.h}

	wrap_phase distutils-r1_python_install
}

python_install_all() {
	use doc && local HTML_DOCS=( docs/. )
	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
		doins Sane/demo_*.py
	fi
}





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/imaging: imaging-1.1.7-r3.ebuild ChangeLog
@ 2013-04-24 16:23 Mike Gilbert (floppym)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2013-04-24 16:23 UTC (permalink / raw
  To: gentoo-commits

floppym     13/04/24 16:23:58

  Modified:             imaging-1.1.7-r3.ebuild ChangeLog
  Log:
  Fix typo in HTML_DOCS, bug 466764 by Martin von Gagern.
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

Revision  Changes    Path
1.2                  dev-python/imaging/imaging-1.1.7-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?r1=1.1&r2=1.2

Index: imaging-1.1.7-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imaging-1.1.7-r3.ebuild	21 Apr 2013 20:33:22 -0000	1.1
+++ imaging-1.1.7-r3.ebuild	24 Apr 2013 16:23:58 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/04/21 20:33:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild,v 1.2 2013/04/24 16:23:58 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -84,7 +84,7 @@
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
+	use doc && local HTML_DOCS=( Docs/. )
 	use examples && local EXAMPLES=( Scripts/. )
 
 	distutils-r1_python_install_all



1.83                 dev-python/imaging/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.82&r2=1.83

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ChangeLog	21 Apr 2013 20:33:22 -0000	1.82
+++ ChangeLog	24 Apr 2013 16:23:58 -0000	1.83
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.82 2013/04/21 20:33:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.83 2013/04/24 16:23:58 floppym Exp $
+
+  24 Apr 2013; Mike Gilbert <floppym@gentoo.org> imaging-1.1.7-r3.ebuild:
+  Fix typo in HTML_DOCS, bug 466764 by Martin von Gagern.
 
 *imaging-1.1.7-r3 (21 Apr 2013)
 





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/imaging: imaging-1.1.7-r3.ebuild ChangeLog
@ 2013-05-07 23:26 Mike Gilbert (floppym)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2013-05-07 23:26 UTC (permalink / raw
  To: gentoo-commits

floppym     13/05/07 23:26:02

  Modified:             imaging-1.1.7-r3.ebuild ChangeLog
  Log:
  Fix installation path for sane demos, bug 468960 by Erik Zeek.
  
  (Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

Revision  Changes    Path
1.3                  dev-python/imaging/imaging-1.1.7-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild?r1=1.2&r2=1.3

Index: imaging-1.1.7-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imaging-1.1.7-r3.ebuild	24 Apr 2013 16:23:58 -0000	1.2
+++ imaging-1.1.7-r3.ebuild	7 May 2013 23:26:02 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r3.ebuild,v 1.2 2013/04/24 16:23:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r3.ebuild,v 1.3 2013/05/07 23:26:02 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -96,6 +96,7 @@
 
 	if use examples && use scanner; then
 		docinto examples/sane
-		doins Sane/demo_*.py
+		dodoc Sane/demo_*.py
+		docompress -x /usr/share/${PF}/examples
 	fi
 }



1.84                 dev-python/imaging/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.83&r2=1.84

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ChangeLog	24 Apr 2013 16:23:58 -0000	1.83
+++ ChangeLog	7 May 2013 23:26:02 -0000	1.84
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.83 2013/04/24 16:23:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.84 2013/05/07 23:26:02 floppym Exp $
+
+  07 May 2013; Mike Gilbert <floppym@gentoo.org> imaging-1.1.7-r3.ebuild:
+  Fix installation path for sane demos, bug 468960 by Erik Zeek.
 
   24 Apr 2013; Mike Gilbert <floppym@gentoo.org> imaging-1.1.7-r3.ebuild:
   Fix typo in HTML_DOCS, bug 466764 by Martin von Gagern.





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-05-07 23:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-24 16:23 [gentoo-commits] gentoo-x86 commit in dev-python/imaging: imaging-1.1.7-r3.ebuild ChangeLog Mike Gilbert (floppym)
  -- strict thread matches above, loose matches on Subject: below --
2013-05-07 23:26 Mike Gilbert (floppym)
2013-04-21 20:33 Michal Gorny (mgorny)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox