gentoo resync : 02.06.2019

7 files changed, 262 insertions, 8 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 0ac5ba2b8958..b912cb9cc4f1 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,12 +2,14 @@ AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8
 AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995
 AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
+AUX cinnamon-4.0-fix-pillow-settings.patch 1363 BLAKE2B 6683cdb92c4da3e09b8f6759216676d666ce832f3687f2775914e27a0f0a3d1427be7774aabc6525f601204682471da3479b35c2bcc3dce3e08929b7d4761b48 SHA512 cd86597c4c5009d8227774d96c375d52c8ab42b944e7dea7013f94c2616511be9b5e3b79b812c65714f58bc67c3a32f34ec71ff0afd4f9ea3c5aea6664817946
 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
 DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
 DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53
 DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
-EBUILD cinnamon-3.6.6-r2.ebuild 7592 BLAKE2B ad37cf9da4574f2202f5e98feb393f6e91dd5c8318dc93745e0d163c8097f310b384804c6f6be6df51b8374776a96c350e231c155cad56b5969517ed137a788e SHA512 0dc653bad186ec29296683f95386fad15cc5d1e79dd090cc35bf1e652a0c04b6363c23af8cc6e84fcdf6dc0cae538705c120e0ac43b9e685660ddb9a6dc04dec
-EBUILD cinnamon-3.8.8.ebuild 6887 BLAKE2B 361d67af525736eb3fa0d20f42c5f8426a019f9bc501b450b1245d8457cb238bef77deb79010f5a795e4fe183c8f34b1bd2997bba6c8f643a74902d0e976d5de SHA512 9417677f50f690f835855bd0ce8757b06714b614235433ff65c3ac3a8f14175924c20d510a95f60ef6c7a2b8293b1b52302924112eed8b257ce2e6661c09516d
-EBUILD cinnamon-4.0.3-r1.ebuild 6847 BLAKE2B eadc559c90991d6c87777bbca311e8e3bd2bff9cc96f679dba80daba382c7851e92b79bf4885b0324bf3fa82df472ac2750cbd8a13d26daf37724d67a9138087 SHA512 81ccb461d637654e3f813111ec194236448775b20a1af6937513afdd5da7801e3fb1091fb1c6d5ca4105fe7fed56dde250ecea4abaf9ebdd8fb3865b8c92f92e
-EBUILD cinnamon-4.0.3.ebuild 6977 BLAKE2B 7c1ec29aa0b65d576cf902b00067887125b0b4f350c3abbc220ee9ea782feb1e893111142d722b34ced666becab01d3d399f9b5946c7d906185e3b813e919619 SHA512 91ab56be829ed0ae2fcdc7e659bb3a9055801450cc3e0037b04c3d06971ec42cf43dd8a4bc05226390cc231ca654e95cdcd3e5002d4321fea3ce5ee0ffcd1dcd
+EBUILD cinnamon-3.6.6-r2.ebuild 7623 BLAKE2B d5275b7e02349be3bbba781980a1c7a877d373c0d11aa1b13928bf151e07c25b9ff86bc526a570a1e2b21c13dc54867264007439e157fac86e3466f810212d5a SHA512 bc12240a4e6ddaeb5baad0a8132fc0d6b20923d2fea9164d18b0b2c910e81e26206c57c70cb5b508caeff8b68a4f583a6645f928634dba4fc2c2bee265ee637c
+EBUILD cinnamon-3.8.8.ebuild 6918 BLAKE2B d0d07475e8877447f22ac3828791d37121e98c4fbb8e32537e966fb1b33bbaf6c95034e55aeaf2ffc536010d498d9fe4a70e3e935256710bafe945aed17b0a5e SHA512 dab6b97d7ef9e8d8c21b1dcbd78e76b2a6cf11407b97f3638c77ebbdbd971bc5096945780cb4990e545140c435201d58487c3477212af1582145747e7c18a4c6
+EBUILD cinnamon-4.0.3-r1.ebuild 6878 BLAKE2B 48af48d98fb39f2519adaa69c534f00eeb34f1c7d8e8ae5cc715b4d3ec4b0fc4a31073f8f8d0f136a97004045ded2e37d1270c111bd1fdf86f0c98d733140184 SHA512 da89cf1b1041856cc737bac52ec2bec75d5c0950f52490f305c0f06e3d6b48cc77fdf617920b504e10198948d3370c99a7c6829eaa104f09c5713b077ab0d1d8
+EBUILD cinnamon-4.0.3-r2.ebuild 6941 BLAKE2B 157085e9ad570acb8ca6fc419a60b9040da76f61a77aee5b08c102ddd96160dde2ccb6954fd505f67412af28d68b53587a1a9c615c06e67e89aa5d7a2563b85a SHA512 f4b0bdf02cc2bdb05ae582646e266d3595efd91e21703ef7e9505c5e4227c7ea301622f06697d07ca8897cbccc40f6200a9bb8866f22ab363f5178b5c1707e90
+EBUILD cinnamon-4.0.3.ebuild 7008 BLAKE2B 1529e7f397e813d67c3e449f0615fdc93e1017adf3a39f1e330829be0962e5aff91b6ed002d657846fc9bded4cadec8d23c97b90bee0c526a5fc148292d29f16 SHA512 ea9cadc0f8dd70c7729513db1e9575b9632990d1e6bc919052e9a069b1baf57fd023fd5b551f96a484d8e1a73f910a2d6a315f4342bebcd7edb02f194951b1b9
 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 86faa2d785d8..de4728de28e6 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
index 0e3a5d99489d..394c580a0b3a 100644
--- a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
index d35a2bceb260..bb933cf417d0 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
new file mode 100644
index 000000000000..01d93daa666b
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="+nls"
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
+	>=gnome-extra/cinnamon-menus-4.0[introspection]
+	>=gnome-extra/cjs-4.0.0[cairo]
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.0[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[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. 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. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-extra/cinnamon-session-4.0
+	>=gnome-extra/cinnamon-settings-daemon-4.0
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-4.0
+	>=gnome-extra/cinnamon-control-center-4.0
+	>=gnome-extra/cinnamon-screensaver-4.0
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	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}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-4.0-fix-pillow-settings.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--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-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, 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 switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
index b3a59766aac2..b97490e84fcc 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
diff --git a/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch b/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch
new file mode 100644
index 000000000000..e06c86b8f3d5
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch
@@ -0,0 +1,43 @@
+--- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py.orig	2019-03-21 16:46:14 UTC
++++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
+@@ -620,31 +620,6 @@ def has_transparency(image):
+         has_alpha(image)
+ 
+ 
+-if Image.VERSION == '1.1.7':
+-
+-    def split(image):
+-        """Work around for bug in Pil 1.1.7
+-
+-        :param image: input image
+-        :type image: PIL image object
+-        :returns: the different color bands of the image (eg R, G, B)
+-        :rtype: tuple
+-        """
+-        image.load()
+-        return image.split()
+-else:
+-
+-    def split(image):
+-        """Work around for bug in Pil 1.1.7
+-
+-        :param image: input image
+-        :type image: PIL image object
+-        :returns: the different color bands of the image (eg R, G, B)
+-        :rtype: tuple
+-        """
+-        return image.split()
+-
+-
+ def get_alpha(image):
+     """Gets the image alpha band. Can handles P mode images with transpareny.
+     Returns a band with all values set to 255 if no alpha band exists.
+@@ -655,7 +630,7 @@ def get_alpha(image):
+     :rtype: single band image object
+     """
+     if has_alpha(image):
+-        return split(image)[-1]
++        return image.split()[-1]
+     if image.mode == 'P' and 'transparency' in image.info:
+         return image.convert('RGBA').split()[-1]
+     # No alpha layer, create one.