summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-10-10 17:18:26 +0000
committerFabian Groffen <grobian@gentoo.org>2009-10-10 17:18:26 +0000
commitb6b51a77df253d168a2fa92f2a4f29278f53f567 (patch)
tree9b903e724f358284685ef4f6836e87978c1df695 /dev-python
parentamd64 stable wrt #288459 (diff)
downloadgentoo-2-b6b51a77df253d168a2fa92f2a4f29278f53f567.tar.gz
gentoo-2-b6b51a77df253d168a2fa92f2a4f29278f53f567.tar.bz2
gentoo-2-b6b51a77df253d168a2fa92f2a4f29278f53f567.zip
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/imaging/ChangeLog5
-rw-r--r--dev-python/imaging/imaging-1.1.6-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index 22c29be9b65e..cd735e3c016d 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/imaging
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.46 2009/10/09 21:12:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.47 2009/10/10 17:18:26 grobian Exp $
+
+ 10 Oct 2009; Fabian Groffen <grobian@gentoo.org> imaging-1.1.6-r1.ebuild:
+ Merge from Prefix
09 Oct 2009; Markus Meier <maekke@gentoo.org> imaging-1.1.6-r1.ebuild:
amd64/x86 stable, bug #287560
diff --git a/dev-python/imaging/imaging-1.1.6-r1.ebuild b/dev-python/imaging/imaging-1.1.6-r1.ebuild
index b008f9c409e3..7e3af260b0e7 100644
--- a/dev-python/imaging/imaging-1.1.6-r1.ebuild
+++ b/dev-python/imaging/imaging-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild,v 1.7 2009/10/09 21:12:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild,v 1.8 2009/10/10 17:18:26 grobian Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -15,7 +15,7 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc examples scanner tk X"
DEPEND="media-libs/jpeg