Replace deprecated PIL imports and depend on virtual/python-imaging, bug 471518.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 286 insertions, 6 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 941933649143..7a82cce1353c 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.23 2013/05/19 13:40:14 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.24 2013/06/10 16:16:41 floppym Exp $
+
+*cinnamon-1.6.7-r2 (10 Jun 2013)
+
+  10 Jun 2013; Mike Gilbert <floppym@gentoo.org> +cinnamon-1.6.7-r2.ebuild,
+  +files/cinnamon-1.6.7-pillow.patch:
+  Replace deprecated PIL imports and depend on virtual/python-imaging, bug
+  471518.
 
   19 May 2013; Magnus Granberg <zorry@gentoo.org> cinnamon-1.6.7-r1.ebuild:
   Add new pax mark bug #457194
@@ -144,4 +151,3 @@
   +files/cinnamon-1.1.3-extensionjs_path.patch,
   +files/cinnamon-1.1.3-xdg-open.patch, +metadata.xml:
   New ebuild for Linux Mint's fork of GNOME Shell (bug #397545).
-
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index fafaa06eefc8..e2ef92a0bd35 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 AUX cinnamon-1.6.1-automagic-gnome-bluetooth.patch 1725 SHA256 788176a82802b45ebff7db3c8540dc4621c09f5e57f37ebeddc34771ca512847 SHA512 c2f7ae82074c98318026a651042bab40183339db4c4f9a48615487bec02a39398f19713af3ff7989632d3d415942ddfb7bb46c540ce73d7a74809d5b3625001d WHIRLPOOL 5ef7e830aff3df3dc0cda5abd0f37296c2b0ae35877fa911548eaa189d435b6ba1df66430a4b423f3a311b419ab8f72b146a330cf06b41ecf431867b4cd798ac
 AUX cinnamon-1.6.1-optional-networkmanager.patch 6418 SHA256 d5fc4f1be5a4b9f8c7e9a18c42a1179e111e8d28f01f8d8d4142d9a9fb44108a SHA512 863a2a7ada2dae38a474bc651094595bf9d0fb64a8523161605977bbfc7522946b93ecf73b4d73061e31390bc0df886e8f299dacbfdc4f076576c3e5c2094a5e WHIRLPOOL 151271653b2f6c30a1dafae93a790e4947581ec37ed8af3713dd4839e404b5b81c74d02267c8f8841c0fafdf5b8cde048cac74197ce5df843166b44e6a1e7999
+AUX cinnamon-1.6.7-pillow.patch 840 SHA256 8da30d383b5a437279d177e360e0b200bbd6670e851419b0e5bb877acbad9b6e SHA512 3321d10072e60ba248dc84916bcce1254925e7b0f2a32982d66b4545294c6f3af1e10265443af35619a17707921ffc818d3f60c4aaf63bab008ba12340f55043 WHIRLPOOL b098f3d8e3bda7e76c358d939d7f4461c70f98785d6a37679974dbc42219e187c5502fbe121787b6ec5db6dc0e109bd5ff1841962130dd88876e562379e90508
 DIST cinnamon-1.6.7.tar.gz 3748727 SHA256 283d8ec894831df5c062e88196c5f0191daa99b1da1cbfada1547a700f50ab24 SHA512 73a774af74ad9223f16cf5082f7507322471f9d329b402f9d5ebba28f5c620234a9e28ffcdd8810c0ca4944b2aa7e3b82e59c445f8d64c0a8c5cd7a036f5c633 WHIRLPOOL 424201aca9d40fd64e8327ade88e662d73ed7a8ba551406a705afd8d2a386321b48b9decae8c3b39939d638b0fcc08198f1ecc415d3d9af38d67fe638e9cce70
 EBUILD cinnamon-1.6.7-r1.ebuild 8232 SHA256 e355f4615132326e903853601476e4feab9dd098c9d006a6048ee1cbf948b9a8 SHA512 c03c0af30d765f72fd8802dbca62e61ace2b178c6fb2c67a381645fcaeb85e37c2ff0d15cca758e99aeef365ada487e381cfd3e7a2ebc5bdda512a8f8da59f45 WHIRLPOOL c2a22820b68943231a2c380350dbf5f2cebfc5fcc5785dd6fbfc362222df0203c01de5d01c01d231e6d39533406eac7cebdbb6096022a55ea6609900e09fa6f4
-MISC ChangeLog 5866 SHA256 445f94c204e6f12313d96ef5fcc3e5e1c4517aefce0b5ee49bf9858c3c0108d1 SHA512 01bbbbc5fe2ad3ec74c8d8d61ce801a8bd24a97880207d31aa3edfae289640de485128591e1e735bee4d2ffec76c1a7fdba8c01a7c2c5dd05ba0d11059e70f60 WHIRLPOOL a0842b89384bde708e15be6908ae9fcfc1dbaee9fbe840f0bf87e7967d3ab54d5ad2698e40601d0e0c86534ca9b0896fe2e5d794a680eb8c69ca9bbfd38a8213
+EBUILD cinnamon-1.6.7-r2.ebuild 8326 SHA256 a2e729516c3d6d6b58a788bfa41c90f0d651c820c5aa4ab70ad40047511b56cb SHA512 5866bf61ff0bb79f144d7f16be4c8010320595928b549fb27e9390f58db66b4e7638ba4a9e7f8dbffa177c03e2d6bee821e8e92342f5ea93af9f257873d2558c WHIRLPOOL 99b43e6459c95c9ad041c72d31ce88ae17839f6bbee15fb04ea4e51d921a48f8bd3212e728c34e9f954056b68c3f68741388908bc120282c8301f5c2ad235fe8
+MISC ChangeLog 6101 SHA256 9b0937994b911e4888cf837527d0e73592c0002f8209b6c820ff1e93ca73b5d5 SHA512 324d8abeeaf365fdce92b79a8e582c506119bf686ed9c4aa2cbcda2e7d4d6d0968a0ef1d8a497dc402949c53e699e889f6219c7d3abb935b010d9c0b45d7cff7 WHIRLPOOL 4f8d7d18f189909209d5b5bd326a0f3f0a8a2b956c00ef0523cdaa349c8573ab2a32531096abf4839582210e29275a01c207a88c696c971997496a8d4492a226
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGY1f0ACgkQe6JQqv15gH/n3ACdH25QKmwqwveDw6vI0lRGtnYE
-qJkAoJIDpFptM9XfbK8rpzPLWofnmT83
-=sqLy
+iF4EAREIAAYFAlG1++oACgkQC77qH+pIQ6SdLAD/c0JT+UElWHMBQSO340qXWiPz
+/eVp2Xq4sPZXI20MnvIBAIiXtUNFbkFyeMwDe4rYnRcwrXefAThvNHCxzsnXjHDL
+=IJZC
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild
new file mode 100644
index 000000000000..c84a4458db27
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild,v 1.1 2013/06/10 16:16:41 floppym Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils gnome2 multilib pax-utils python-single-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${MY_PV} -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+bluetooth +networkmanager"
+KEYWORDS="~amd64 ~x86"
+
+# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
+# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
+# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
+# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome
+COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
+	>=dev-libs/gjs-1.29.18
+	>=dev-libs/gobject-introspection-0.10.1
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=media-libs/clutter-1.7.5:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	app-misc/ca-certificates
+	>=dev-libs/json-glib-0.13.2
+	>=gnome-base/gnome-desktop-2.91.2:3=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=media-libs/gstreamer-0.10.16:0.10
+	>=media-libs/gst-plugins-base-0.10.16:0.10
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-wm/muffin-1.0.5[introspection]
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	x11-libs/pango[introspection]
+	>=dev-libs/libcroco-0.6.2:0.6
+
+	gnome-base/gconf:2[introspection]
+	>=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection]
+	gnome-base/librsvg
+	media-libs/libcanberra
+	media-sound/pulseaudio
+
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-apps/mesa-progs
+
+	${PYTHON_DEPS}
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.4:=[introspection] )
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )"
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. timedated or DateTimeMechanism implementation for cinnamon-settings
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-base/gnome-session-3.2.1-r1
+
+	>=gnome-base/gnome-settings-daemon-2.91
+	>=gnome-base/gnome-control-center-2.91.92-r1
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python:2
+	virtual/python-imaging
+	dev-python/lxml
+
+	x11-themes/gnome-icon-theme-symbolic
+
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+	gnome-extra/nemo
+
+	|| (
+		app-admin/openrc-settingsd
+		>=sys-apps/systemd-30
+		<gnome-base/gnome-settings-daemon-3.3.5 )
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/linuxmint-Cinnamon-5ab432d"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
+
+	# Make networkmanager optional, bug #398593
+	epatch "${FILESDIR}/${PN}-1.6.1-optional-networkmanager.patch"
+
+	# Replace deprecated PIL imports, bug #471518
+	epatch "${FILESDIR}/${P}-pillow.patch"
+
+	# Gentoo uses /usr/libexec
+	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
+		-i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed"
+
+	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
+	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+		-i files/usr/bin/cinnamon-menu-editor \
+		-i files/usr/bin/cinnamon-settings \
+		-i files/usr/lib/cinnamon-menu-editor/Alacarte/config.py \
+		-i files/usr/lib/cinnamon-menu-editor/Alacarte/MainWindow.py \
+		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py || die "sed 2 failed"
+	if [[ "$(get_libdir)" != lib ]]; then
+		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+	fi
+
+	if ! use bluetooth; then
+		rm -rv files/usr/share/cinnamon/applets/bluetooth@cinnamon.org || die
+	fi
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	eautoreconf
+	gnome2_src_prepare
+
+	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
+	# Note: sed Makefile.in because it is generated from several Makefile.ams
+	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
+		-i src/Makefile.in browser-plugin/Makefile.in || die "sed 3 failed"
+}
+
+src_configure() {
+	# Don't error out on warnings
+	gnome2_src_configure \
+		--enable-compile-warnings=maximum \
+		--disable-schemas-compile \
+		--disable-jhbuild-wrapper-script \
+		$(use_with bluetooth) \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{settings,menu-editor}
+	# Fix broken shebangs
+	sed -e "s%#!.*python%#!$(python_get_PYTHON)%" \
+		-i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} \
+		-i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die
+
+	# Required for gnome-shell on hardened/PaX, bug #398941 and #457194
+	# PaX EMUTRAMP need to be on
+	pax-mark mrE "${ED}usr/bin/cinnamon"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version '>=media-libs/gst-plugins-good-0.10.23:0.10' || \
+	   ! has_version 'media-plugins/gst-plugins-vp8:0.10'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23:0.10"
+		ewarn "and media-plugins/gst-plugins-vp8:0.10, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
+		ewarn "fallback mode, or switch to open-source drivers."
+	fi
+
+	if has_version "media-libs/mesa[video_cards_radeon]"; then
+		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
+		elog "Make sure that gallium architecture for r300 and r600 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[gallium]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+		fi
+	fi
+
+	if has_version "media-libs/mesa[video_cards_intel]"; then
+		elog "Cinnamon is unstable under gallium-mode i915/i965 mesa drivers."
+		elog "Make sure that classic architecture for i915 and i965 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[classic]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=classic."
+		fi
+	fi
+}
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.6.7-pillow.patch b/gnome-extra/cinnamon/files/cinnamon-1.6.7-pillow.patch
new file mode 100644
index 000000000000..77b98fadbce1
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.6.7-pillow.patch
@@ -0,0 +1,30 @@
+Replace deprecated PIL imports
+https://bugs.gentoo.org/show_bug.cgi?id=471518
+--- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
++++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
+@@ -20,7 +20,7 @@
+     import lxml.etree
+     import locale    
+     import imtools
+-    import Image
++    from PIL import Image
+     import tempfile
+     import math
+     import cgi
+--- a/files/usr/lib/cinnamon-settings/imtools.py
++++ b/files/usr/lib/cinnamon-settings/imtools.py
+@@ -18,10 +18,10 @@
+ from itertools import cycle
+ from urllib import urlopen
+ 
+-import Image
+-import ImageDraw
+-import ImageEnhance
+-import ImageOps, ImageChops, ImageFilter
++from PIL import Image
++from PIL import ImageDraw
++from PIL import ImageEnhance
++from PIL import ImageOps, ImageChops, ImageFilter
+ 
+ ALL_PALETTE_INDICES = set(range(256))
+ CHECKBOARD = {}