From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- gnome-extra/cinnamon/Manifest | 14 -- gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild | 238 --------------------- gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild | 238 --------------------- gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild | 238 --------------------- gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild | 238 --------------------- gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild | 234 -------------------- gnome-extra/cinnamon/cinnamon-3.4.6.ebuild | 234 -------------------- .../cinnamon-2.6.7-optional-networkmanager.patch | 88 -------- .../cinnamon/files/cinnamon-2.8.3-set-wheel.patch | 56 ----- 9 files changed, 1578 deletions(-) delete mode 100644 gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild delete mode 100644 gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild delete mode 100644 gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild delete mode 100644 gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild delete mode 100644 gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild delete mode 100644 gnome-extra/cinnamon/cinnamon-3.4.6.ebuild delete mode 100644 gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch delete mode 100644 gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch (limited to 'gnome-extra/cinnamon') diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 429be7e83192..36e0012f049b 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1,21 +1,7 @@ AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8d67f098a7ccde319589c330736a9624537ac2dcfbee75c8971cb6b88cb49ae36b380b0fe3024d55c54e127cc2cec0d21ade17f56b9ed9be6 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460 -AUX cinnamon-2.6.7-optional-networkmanager.patch 3508 BLAKE2B a05bd853166e8e6b2f7598c7f3de6ad817d4603a3b14f64b10e966846ae4f3894de52b80126d0969e549e19262870c56410851cc61faedd90bbfb71b946b5480 SHA512 3798c0e616297390db3a5006ca7616546979796b0665496536c58745c97b05bed6fb363e73c0ac0ef83d024cd8d5f3faa309df1c5acc8f5efd481b8bc9b43a5c AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995 -AUX cinnamon-2.8.3-set-wheel.patch 2637 BLAKE2B 63f9b73909ec386337e85889b52fe570ff0a1e8bda28f68b989c1b07956396224d9425357c263f16186da69253623cd776c89251a424308bbf8b936a7be62bf0 SHA512 cff8fb42a81d71b929327df5d56a68b68a96e79d4b85125ea7de0ed2dca53c6b45d08deccafa4453a7471f52aa6bf7d39ed979d2a085906997969a63e7dd7a8c AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db -DIST cinnamon-3.0.7.tar.gz 3065791 BLAKE2B cd2cef9e71a77c9e8be384e96864a8d92d0e0922ea5992117a980e7d22eeaf9fb3a47a94fcac54bbd302b580d5e496784558c45abcb455516a8a975469fb8dd8 SHA512 db3f2532525c71b0841ce22245518502f8e905fd353c22e41dc57551cf68422ab6b53a57e4089664e8db9035a7723214756de78d2b5d5a92e11515216b15afbf -DIST cinnamon-3.2.0.tar.gz 2216495 BLAKE2B 1a1ccf54c939af4a33da9b247858211fc9b983e823292d80110780ccff18759227b68b5fcbe4689e52e125891d8ca30eec9cb488f8a62d307cee7595dc1b7249 SHA512 340530d77e68a5680cfa44afa3efc157552a7319f9badb251456d43e4e0a4e8c7cecf8e273c6cedec05e8248d68bbbdca2f8bb9d1766c418a6bc10d386e38302 -DIST cinnamon-3.2.6.tar.gz 2225445 BLAKE2B 93e402aa7caccee79c455a49d0f3eb8a42829f42b7e5d1e90caab57451ff685f832d8f303083876f565fe840b746c5fa802195b78db58b8e1f9b718a5016dd1f SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb -DIST cinnamon-3.2.7.tar.gz 2226152 BLAKE2B f62e9405b1373daa696bee9f9c82af34ab76753ea4e897ee82674b4b14a4719905f3829de2f1a8c0bb75d84368ca23d39e10e9a19348d6e944709967534a53e9 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df -DIST cinnamon-3.4.2.tar.gz 2213346 BLAKE2B 90a4013ff417a05f14b716025da6acddd3f81c59976bcf4a734312682880a0622bf22a0d63c1acef2dcf27165726c7efd0723e20784d5269565bbaa5f64e7211 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 -DIST cinnamon-3.4.6.tar.gz 2217209 BLAKE2B 87a01ffe8806fd7d252035533be25bd197e06f29f02644197132a9d5fa3eb766760fb0df5fc00c61e5f35b3d45b8464824def510e233fa93c84038c28aea5ccc SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642 -EBUILD cinnamon-3.0.7-r2.ebuild 7951 BLAKE2B 3614bf01d70a45130805ce0065d2e82e6a91295dd7d5b0439b1c4763957ca08aa3a95ad0decad80ec5e62e8055d28685a23dca3e012f6dcbbe73243f480915af SHA512 3a838d7a9ba30a4d6bd55be5be0ef1ac86f25607ac13c274eccd7154fb5a87feb0526c4d9ab5b306db404181dfb4414211b30ca9bc6a07d5a63c43317ef95c4b -EBUILD cinnamon-3.2.0-r2.ebuild 7913 BLAKE2B 60f0cf065601cf95b9b870b6a6771d0cb69c6f4a91ce3bd52033fbc1102f6655004c647e7079d6cc7038357ce2ea5c8647ebe5a68abd2e5596c0fe80260ae4c6 SHA512 8f2f6b7bb9de2e6ae58f2f3135f26e75768463497faa0f8623bd807d0a25a8ce29d216e27db6ff9b71b7f17b2c0c64b7ccdd71e19ef78dba9c265be2a37238f6 -EBUILD cinnamon-3.2.6-r1.ebuild 7914 BLAKE2B 39a36d52cabb14fd6189cfa135af8bcedf21797d0cefff2d8c91fefc0d687d8fa341524c23e0bf6411210bf05c9ff7632677ddb3d7d410360c63a8735419ef76 SHA512 48b49241719827b0e283d65d9164a1e4f780de70ebb3f8d82dc3e74b9572552506c1e5f6df43553bc446f33d45802889b1f8828f753ddd19955d99cfdb1bf3a0 -EBUILD cinnamon-3.2.7-r1.ebuild 7914 BLAKE2B 39a36d52cabb14fd6189cfa135af8bcedf21797d0cefff2d8c91fefc0d687d8fa341524c23e0bf6411210bf05c9ff7632677ddb3d7d410360c63a8735419ef76 SHA512 48b49241719827b0e283d65d9164a1e4f780de70ebb3f8d82dc3e74b9572552506c1e5f6df43553bc446f33d45802889b1f8828f753ddd19955d99cfdb1bf3a0 -EBUILD cinnamon-3.4.2-r1.ebuild 7784 BLAKE2B 2f0cb390f83b94c46b0bd34544a90f12342445ed4dd0cf0b8f90b170aa2a81cb29d596a0d17ffffd983032f422bca2d8cf19286f55770f1b410a246cafdaac1b SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45 -EBUILD cinnamon-3.4.6.ebuild 7784 BLAKE2B 2f0cb390f83b94c46b0bd34544a90f12342445ed4dd0cf0b8f90b170aa2a81cb29d596a0d17ffffd983032f422bca2d8cf19286f55770f1b410a246cafdaac1b SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45 EBUILD cinnamon-3.6.6-r2.ebuild 7642 BLAKE2B dc7e29359f347f0069431a243814c820b8e2cb78895c61c29262edba0458befdac4973c90d122d59123ca85ac4100ef6f0865170bcc168ce9ff0f14d7ce479a7 SHA512 6e073e632d08638985159062bf993a472a45e64cf1b4a11d44f981d1f91637d82b7adc9870c75cd28f2d61608fd1b2ee1fb6f0eedf73f42ebd12f556dd242501 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild deleted file mode 100644 index 17231388f287..000000000000 --- a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{2_7,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.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/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/pygobject:3[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') - $(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-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} - $(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}-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 "=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 - x11-libs/xapps - - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') - $(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-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} - $(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}-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-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 "=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 - x11-libs/xapps - - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') - $(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-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} - $(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}-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-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 "=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 - x11-libs/xapps - - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') - $(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-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} - $(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}-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-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 "=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 - x11-libs/xapps - - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') - $(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-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} - $(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}-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() { - gnome2_src_configure \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --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 "=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 - x11-libs/xapps - - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') - $(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-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} - $(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}-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() { - gnome2_src_configure \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --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 " -Date: Sat, 10 May 2014 15:14:05 -0400 -Subject: [PATCH] Make networkmanager dependency optional for Gentoo - ---- - configure.ac | 35 ++++++++++++++++++++++++++++++++++- - js/misc/config.js.in | 2 ++ - src/Makefile.am | 5 ++++- - 3 files changed, 40 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b5668f4..5f600dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,7 +82,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION - libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION - gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION - polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes -- libnm-glib libnm-util gnome-keyring-1 atk-bridge-2.0) -+ atk-bridge-2.0) -+ -+########################## -+# Check for NetworkManager -+########################## -+NM_MIN_VERSION=0.9 -+AC_ARG_ENABLE(networkmanager, -+ AS_HELP_STRING([--disable-networkmanager], -+ [disable NetworkManager support @<:@default=auto@:>@]),, -+ [enable_networkmanager=auto]) -+ -+if test "x$enable_networkmanager" != "xno"; then -+ PKG_CHECK_MODULES(NETWORKMANAGER, -+ [libnm-glib libnm-util gnome-keyring-1], -+ [have_networkmanager=yes], -+ [have_networkmanager=no]) -+ -+ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS" -+ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS" -+else -+ have_networkmanager="no (disabled)" -+fi -+ -+if test "x$have_networkmanager" = "xyes"; then -+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager]) -+ AC_SUBST([HAVE_NETWORKMANAGER], [1]) -+else -+ if test "x$enable_networkmanager" = "xyes"; then -+ AC_MSG_ERROR([Couldn't find NetworkManager.]) -+ fi -+ AC_SUBST([HAVE_NETWORKMANAGER], [0]) -+fi -+ -+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") - - PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION) - -diff --git a/js/misc/config.js.in b/js/misc/config.js.in -index 704989b..df7e014 100644 ---- a/js/misc/config.js.in -+++ b/js/misc/config.js.in -@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; - const GJS_VERSION = '@GJS_VERSION@'; - /* 1 if gnome-bluetooth is available, 0 otherwise */ - const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; -+/* 1 if networkmanager is available, 0 otherwise */ -+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; - /* The system TLS CA list */ - const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; -diff --git a/src/Makefile.am b/src/Makefile.am -index 0b0a4a9..cf3a606 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -290,7 +290,10 @@ libcinnamon_la_LIBADD = \ - libcinnamon_la_CPPFLAGS = $(cinnamon_cflags) - - Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir --Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0 -+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 -+if HAVE_NETWORKMANAGER -+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 -+endif - Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) - Cinnamon_0_1_gir_LIBS = libcinnamon.la - Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) --- -2.4.3 - diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch deleted file mode 100644 index a018013e60d6..000000000000 --- a/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -147,12 +147,11 @@ - - class PasswordDialog(Gtk.Dialog): - -- def __init__ (self, user, password_mask, group_mask): -+ def __init__ (self, user, password_mask): - super(PasswordDialog, self).__init__() - - self.user = user - self.password_mask = password_mask -- self.group_mask = group_mask - - self.set_modal(True) - self.set_skip_taskbar_hint(True) -@@ -218,14 +217,7 @@ - def change_password(self): - newpass = self.new_password.get_text() - self.user.set_password(newpass, "") -- mask = self.group_mask.get_text() -- if "nopasswdlogin" in mask: -- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) -- mask = mask.split(", ") -- mask.remove("nopasswdlogin") -- mask = ", ".join(mask) -- self.group_mask.set_text(mask) -- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') -+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') - self.destroy() - - def set_passwords_visibility(self): -@@ -563,7 +555,7 @@ - model, treeiter = self.users_treeview.get_selection().get_selected() - if treeiter != None: - user = model[treeiter][INDEX_USER_OBJECT] -- dialog = PasswordDialog(user, self.password_mask, self.groups_label) -+ dialog = PasswordDialog(user, self.password_mask) - response = dialog.run() - - def _on_groups_button_clicked(self, widget): -@@ -807,11 +799,11 @@ - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) - description = "%s\n%s" % (fullname, username) - piter = self.users.append(None, [new_user, pixbuf, description]) -- # Add the user to his/her own group and sudo if Administrator was selected -+ # Add the user to his/her own group and wheel if Administrator was selected - if dialog.account_type_combo.get_active() == 1: -- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s,wheel" % username]) - else: -- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s" % username]) - self.load_groups() - dialog.destroy() - -- cgit v1.2.3