From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 183A51382CD for ; Sat, 25 Jun 2016 16:53:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2801E0B52; Sat, 25 Jun 2016 16:53:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7A0BE0B4F for ; Sat, 25 Jun 2016 16:53:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6427F340C5B for ; Sat, 25 Jun 2016 16:53:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76CBF242E for ; Sat, 25 Jun 2016 16:53:15 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1466871972.4ee2645d4e63a78eea6f1ab20c0ddd03acfdc2f5.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon/Manifest gnome-extra/cinnamon/cinnamon-3.0.6.ebuild X-VCS-Directories: gnome-extra/cinnamon/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 4ee2645d4e63a78eea6f1ab20c0ddd03acfdc2f5 X-VCS-Branch: master Date: Sat, 25 Jun 2016 16:53:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 63ec871d-cc72-4bfa-a68e-c1ebaa90a8b3 X-Archives-Hash: e9142652c7ddcf4316b2c574731eb65c commit: 4ee2645d4e63a78eea6f1ab20c0ddd03acfdc2f5 Author: Pacho Ramos gentoo org> AuthorDate: Sat Jun 25 15:01:35 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Jun 25 16:26:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee2645d gnome-extra/cinnamon: Version bump Package-Manager: portage-2.3.0_rc1 gnome-extra/cinnamon/Manifest | 1 + gnome-extra/cinnamon/cinnamon-3.0.6.ebuild | 239 +++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+) diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index a48cff1..ecb1caf 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1 +1,2 @@ DIST cinnamon-2.8.8.tar.gz 3026643 SHA256 33f838cb9c1d4213ebb18d5869949757dda97a6e0745f224d06be75de69caee7 SHA512 e41fae744ea2dfcb3589a47f689b230369a8dc4c3682f3cc15836a9be6c67fd1cd872223084b518cd422057431ea77f7df67055757b5cd43e5e96cb3cb3a2ec5 WHIRLPOOL 1cb5e0b13814d4b21e7711ad0d5754aa85c36e4616d48e7dbebad1bd7d34b928a5b4d4d55b6fd12fb2b44c96b22535ca68b3b6542af99306a609cbc58ea59784 +DIST cinnamon-3.0.6.tar.gz 3065823 SHA256 1a3aafe4339948e44b2866b25ac6ecc70b021ef8edb674a9e2af0a59ef42d405 SHA512 ed97986d688281055d14896e1f6bd2c2835b5c87b7f756e9385c91ab05554ccb638b925156032147bd784a7f96acfc7bf3d922db27397c1de3315b15cae5f8c4 WHIRLPOOL bb60479a72b9c0a5537419e497b4c877e4d900c2131b4e7dab78d72cd61e152a4c7134112fa88dfc5cd5107cbade9d466ede82223f4e97107dcaaf081d9bf92c diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild new file mode 100644 index 0000000..0efad74 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild @@ -0,0 +1,239 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +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 to 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="${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/gconf:2[introspection] + gnome-base/librsvg + >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] + gnome-extra/cinnamon-menus[introspection] + >=gnome-extra/cjs-2.8.0 + >=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.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-3.0.0[introspection] + 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/adwaita-icon-theme + + >=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] + 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}-2.8.0-background.patch + + # Fix automagic gnome-bluetooth dep, bug #398145 + eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch + + # Optional NetworkManager, bug #488684 + eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch + + # Use wheel group instead of sudo (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3576 + eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.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 + + # 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 "