Convert shebangs in cinnamon-settings.py (bug #450442, thanks to Antoine Lemoine).

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 256 insertions, 10 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index ec5018c9da59..3471e3d24c13 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/cinnamon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.20 2012/12/30 02:39:06 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.21 2013/01/07 05:13:34 tetromino Exp $
+
+*cinnamon-1.6.7-r1 (07 Jan 2013)
+
+  07 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cinnamon-1.6.7-r1.ebuild:
+  Convert shebangs in cinnamon-settings.py (bug #450442, thanks to Antoine
+  Lemoine).
 
 *cinnamon-1.6.7 (30 Dec 2012)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 97013e15013a..eca3b3bb75f7 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -6,17 +6,18 @@ AUX cinnamon-1.6.1-optional-networkmanager.patch 6418 SHA256 d5fc4f1be5a4b9f8c7e
 DIST cinnamon-1.6.1.tar.gz 2613322 SHA256 c43a6e3aac7aca14685ba7e7cbf815f047a2afe7d5e037a6dad69067ee4760ca SHA512 1fe8be36daf35025b7cfac8e9f27b93bd271384e0516fe19e3bb273b314984fbe39a2adb3f6ef4e421d0bb0bbe1043558a2285a70d4ee48c756aa6e77852f6d6 WHIRLPOOL bd1c700fef157933214f5dfe41d31ccf6e6c7746035bf12c166b364677fe0e88b145aa6f2d828f4524a57d60986e87532091803ff079f68b3b767e6c9173bbe8
 DIST cinnamon-1.6.7.tar.gz 3748727 SHA256 283d8ec894831df5c062e88196c5f0191daa99b1da1cbfada1547a700f50ab24 SHA512 73a774af74ad9223f16cf5082f7507322471f9d329b402f9d5ebba28f5c620234a9e28ffcdd8810c0ca4944b2aa7e3b82e59c445f8d64c0a8c5cd7a036f5c633 WHIRLPOOL 424201aca9d40fd64e8327ade88e662d73ed7a8ba551406a705afd8d2a386321b48b9decae8c3b39939d638b0fcc08198f1ecc415d3d9af38d67fe638e9cce70
 EBUILD cinnamon-1.6.1.ebuild 8229 SHA256 0239f0474ff9b447a9d1fa239fac673bb26a406040da8c5ac9e92dbcfab5babb SHA512 d782d2189bc2c63f28430d0a469c02422b9ff4c50fce39a87f6ea0f648a8be0941fc6c05fee616836782392e59d4d6dd696321924e1dee57fda775638b313b8d WHIRLPOOL 753c070c62d62116b71dfe620613ef48eb8f2cc3b232b018fd4ea770dfbe68a884453610cdf1eb404653363cc40fdcb0cd7075aeadbe7a3da00abff24158d560
+EBUILD cinnamon-1.6.7-r1.ebuild 8193 SHA256 3dfcc701a3a248c836660150c22100f5388ee9438126f78bf649af77c335e270 SHA512 61d73b7224c31b713cf596e62dd30c1e02ae6ecf5e3faac9ac1a5a87208c8ba96a929fed047cc195b88a14f8f67e52b3d3a7ed49f749f8b2093d58655c83af1e WHIRLPOOL a9b6da0285a7565bf987a6dbf5ab182e06aa3e7f4d37b83b5cc3b1180294353eb96ef43e47b3df4dbf1c8927989e73b39a1be6b7b030145076eba9ef4e567010
 EBUILD cinnamon-1.6.7.ebuild 8119 SHA256 bed168a371653d00e3401fe409c195edb9afd0b95d6e3cf6444ba4daf84aa426 SHA512 81e4b8080cd9dc816abd3a36a742f3b3124e84937712dab5023ab9c1b4d950e814b93b5fdb1a826ef0520b5e904d41f868945868c534710442f5d2986e5f46a9 WHIRLPOOL f6822a0f2dc956cb4e0f9cf5946acecb65702322dddb096acf9548147a517e9d06ecaf4fc4ce970b734f16a33af7dfd4c637ecc32c413c925002edd3bcb5de3a
-MISC ChangeLog 5421 SHA256 dcf9e4e56148bf4fedd419b38e336714026a102706b342e2e821432032799e2e SHA512 1c6abd2efe003c6367bb536e35aca6513ef55598af1d453210ae4c1d3a771bfae45d683993d086980355561861c79c33ab0ad1945980fc95e489335960b36f80 WHIRLPOOL 03363290f1e617741aafaa4b63094e9d7c22b80965f7d8591be94e0781ef31fe8733509b94f883e0f2226eeb44bd7e15ce662ab8125560187bdadf96e641eeb3
+MISC ChangeLog 5631 SHA256 bc1dc61fcb5f7bb1ecff62a97aadadc10abb8345c2db9222724eb45033000850 SHA512 53f0fec5a885e588589af52ba8de0a9965a9533e9fcdbf5c526f4f35324be666311fd9f2f9a965c42c46793294d8c580fa6a0f82f495dcf707bbe943d350a93a WHIRLPOOL cb9be513f8105e22ac224371eb986d87c691637255eb702427836f473519d5aca6b34e5798e6a8757ab426159ef02358b3af81a5f505faaca3653a136b16c63f
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ36lLAAoJEJ0WA1zPCt1huW4IALQABFTqS7HdNqsiWIQ3TOLn
-o4iJ+FDdKReF+RFLNssU41zUMbeCoXYGCL+78QZCHa3dLWCRiVmJd/2PaaBF7gOY
-2fuJL8/XfhpdsvegNXTWfl9oz9RpaylIkmtSPej5aE0Ob5zURndZDT1kXBrvUCKD
-tjgPlZwEGQ2rIQeupCZmfkS0+0YgHXA+FfxfXP9z3aFmw3oNb0ZRVgki+6p3BQk3
-qK0/n0a0WeMJYZf6GA0WITnZMUa8VbkMDA/65gSLfSJ5XFvQ60RnBOH93kCn5wUV
-lKLBlmG5zNEcu6W2XeFAqX78gUelIqP9BXMcUBuu94P1mIYr98ILiYTZkfE7xqQ=
-=EIB2
+iQEcBAEBCAAGBQJQ6ll/AAoJEJ0WA1zPCt1hzlsH/1RxHhJ5GqrqF1PSKsqq4B+d
+vDpACFw5O6vLyEMJ3v9WS86aWW1MYwFU2vHK+d0Q3qY7YVWiJ3FqhQe9MeCjWrL2
+T9T/we4Fy2TzUh890a61dDqp++Ay3J57+luH59o2+H8cYuYhcpuovNjKQe/3s7zR
+487xTXTlBs7yRvFAtGrBRvLtSxHqOX4pIPAtsCnObOf0JzvhYA6ACJ2as3CgLTkI
+5oTo4jUtD7ovAAhJ7g7MjcYEKwfbi0vH/PHCTDxx0S6AM8KB0DeRgpboey1OT77+
+9pXtsTtHTrgSu3qkUN7NF9s10XSeVXxOcl40TqlG25UqcVeLYShhyTbEOxe7Dd0=
+=hQ7M
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
new file mode 100644
index 000000000000..3e85af9e553b
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
@@ -0,0 +1,238 @@
+# 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-r1.ebuild,v 1.1 2013/01/07 05:13:34 tetromino 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
+	dev-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"
+
+	# 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
+	pax-mark mr "${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
+}