From f7c82aea1a18bb501316a6ef0982f80fb41b6438 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 15 Nov 2015 22:36:03 +0100 Subject: gnome-extra/cinnamon: Version bump Package-Manager: portage-2.2.24 --- gnome-extra/cinnamon/Manifest | 1 + gnome-extra/cinnamon/cinnamon-2.8.3.ebuild | 247 +++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+) create mode 100644 gnome-extra/cinnamon/cinnamon-2.8.3.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 9d4cb391a8c1..dbaa99ec211e 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1,3 +1,4 @@ DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a DIST cinnamon-2.6.9.tar.gz 2968234 SHA256 9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756 SHA512 372492f9a9833ae3b7ba2b22d6c4cec8bb8c0a02282d1efe595e8a822a7064d7129b2a56f9df7dd4ec8f329bee3db22ffb41672752f5daa6811973d42cae150d WHIRLPOOL 83e04e781ac175f4ce885c84554d70d8322a613fac30735af3efb57e43afb8ffb757771cc153b4b1ae8070a219972d76f707ce2fe40b7714aee6854e9a0bdd0d +DIST cinnamon-2.8.3.tar.gz 3024863 SHA256 e83e3f9fcf00214ec8444dfe4be88e9d00bec14f03b3cbf01dd6dfa7237dec9b SHA512 28a3c43f268066665999d7a9c0e512e45b3f8be9ef2213ca092b5bb3ce1a8f4a595dc2b8d4d5c6486647ce37577b7c607d7f06af17fc4bccbf6ff0a807a85b32 WHIRLPOOL d37c1c319e547e8a5d1a06a6478b5a76d4c21b05a7b4e4eb280dfb29515f6a73ee01725477a1d9a03308a86033d98cdf0572674a2399d4334e4b204c00ee5c06 diff --git a/gnome-extra/cinnamon/cinnamon-2.8.3.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.3.ebuild new file mode 100644 index 000000000000..12c8a031fd8c --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-2.8.3.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +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://cinnamon.linuxmint.com/" + +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" + +# bluetooth support dropped due bug #511648 +IUSE="+nls +networkmanager" #+bluetooth + +# We need *both* python 2.7 and 3.x +REQUIRED_USE="${PYTHON_REQUIRED_USE} + python_targets_python2_7 + || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) +" + +KEYWORDS="~amd64 ~x86" + +COMMON_DEPEND=" + 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/gconf:2[introspection] + gnome-base/librsvg + >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] + gnome-extra/cinnamon-menus[introspection] + >=gnome-extra/cjs-2.4 + >=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 + media-sound/pulseaudio:0=[glib] + net-libs/libsoup:2.4[introspection] + >=sys-auth/polkit-0.100[introspection] + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.9.12:3[introspection] + x11-libs/pango[introspection] + >=x11-libs/startup-notification-0.11 + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + >=x11-wm/muffin-2.5[introspection] + ${PYTHON_DEPS} + networkmanager? ( + gnome-base/libgnome-keyring + >=net-misc/networkmanager-0.8.999[introspection] ) +" +#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[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. 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] sys-power/upower-pm-utils[introspection] ) + + >=gnome-extra/cinnamon-session-2.4 + >=gnome-extra/cinnamon-settings-daemon-2.4 + + >=sys-apps/accountsservice-0.6.14[introspection] + + >=app-accessibility/caribou-0.3 + + x11-misc/xdg-utils + + dev-python/dbus-python[python_targets_python2_7] + dev-python/gconf-python:2[python_targets_python2_7] + dev-python/lxml[python_targets_python2_7] + dev-python/pexpect[python_targets_python2_7] + dev-python/pycairo[python_targets_python2_7] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyinotify[python_targets_python2_7] + dev-python/pypam[python_targets_python2_7] + dev-python/pillow[python_targets_python2_7] + + x11-themes/gnome-themes-standard[gtk] + x11-themes/gnome-icon-theme-symbolic + + >=gnome-extra/nemo-2.4 + >=gnome-extra/cinnamon-control-center-2.4 + >=gnome-extra/cinnamon-screensaver-2.4 + + gnome-extra/polkit-gnome + + networkmanager? ( + gnome-extra/nm-applet + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + nls? ( >=gnome-extra/cinnamon-translations-2.4 ) +" +#bluetooth? ( net-wireless/cinnamon-bluetooth ) + +DEPEND="${COMMON_DEPEND} + dev-python/polib[python_targets_python2_7] + >=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}/Cinnamon-${PV}" + +pkg_setup() { + python_setup +} + +src_prepare() { + # Fix backgrounds path as cinnamon doesn't provide them + # https://github.com/linuxmint/Cinnamon/issues/3575 + epatch "${FILESDIR}"/${PN}-2.8.0-background.patch + + # Fix automagic gnome-bluetooth dep, bug #398145 + epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch + + # Optional NetworkManager, bug #488684 + epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch + + # Use wheel group instead of sudo (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3576 + epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch + + # Fix GNOME 3.14 support (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3577 + epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.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 + + if ! use networkmanager; then + rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die + fi + + epatch_user + + # 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() { + # https://bugs.gentoo.org/show_bug.cgi?id=536374 + # https://github.com/linuxmint/Cinnamon/issues/3843 + append-ldflags $(no-as-needed) + + gnome2_src_configure \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --disable-rpath \ + --disable-jhbuild-wrapper-script \ + $(use_enable networkmanager) \ + --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ + BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ + --without-bluetooth +} + +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 "