commit: 2ca6628f3dd84a484b59b1825b5df6e51e0d32a4
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 2 14:16:30 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 2 14:17:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca6628f
gnome-extra/cinnamon: remove old that still had USE=gtk dep on
gnome-themes-standard
The gnome-themes-standard versions that had IUSE=gtk got cleaned up, so need to
clean up here too to fix repoman in cinnamon
Gentoo-bug: 596556
Acked-by: Kristian Fiskerstrand <k_f <AT> gentoo.org>
gnome-extra/cinnamon/Manifest | 2 -
gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild | 243 ---------------------
gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild | 238 --------------------
gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild | 238 --------------------
.../cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch | 11 -
5 files changed, 732 deletions(-)
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 0bcbd88d9b1..6566485a98a 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,5 +1,3 @@
-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
DIST cinnamon-3.0.7.tar.gz 3065791 SHA256
0aa0ce174a4638f54ddb2f0dc1f93a847678fa225c7a4fae718ffd14f1c8694f SHA512
db3f2532525c71b0841ce22245518502f8e905fd353c22e41dc57551cf68422ab6b53a57e4089664e8db9035a7723214756de78d2b5d5a92e11515216b15afbf
WHIRLPOOL
7f7e0f3841d8790f332342e9d0696c8f70e81657ea02e1374871505be1c5ecdb7e9d4fc4fd0d600bf69fcd856123a58d5b272b4de03f9dd7d4c7d3d8278154b0
DIST cinnamon-3.2.0.tar.gz 2216495 SHA256
c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d SHA512
340530d77e68a5680cfa44afa3efc157552a7319f9badb251456d43e4e0a4e8c7cecf8e273c6cedec05e8248d68bbbdca2f8bb9d1766c418a6bc10d386e38302
WHIRLPOOL
58c749c9679f582a7ef088f4a8026d7027c84368be5d2c07ba9dd29c9a0781ad962fdbb4342538bb3b801f2fce60c483a0b806008e6fecb2698b367969aefc52
DIST cinnamon-3.2.6.tar.gz 2225445 SHA256
ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512
b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb
WHIRLPOOL
2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
b/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
deleted file mode 100644
index c7179a515f0..00000000000
--- a/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
+++ /dev/null
@@ -1,243 +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_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
- 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]
- 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[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}
- $(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
-
- # Fix GNOME 3.14 support (from Fedora/Arch)
- # https://github.com/linuxmint/Cinnamon/issues/3577
- eapply "${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/netw...@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 "<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-3.0.6-r1.ebuild
b/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild
deleted file mode 100644
index 45c4dc6b9a6..00000000000
--- a/gnome-extra/cinnamon/cinnamon-3.0.6-r1.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_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[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}
- $(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/netw...@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 "<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-3.0.7-r1.ebuild
b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
deleted file mode 100644
index 81153441342..00000000000
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.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_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[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}
- $(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/netw...@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 "<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/files/cinnamon-2.8.3-gnome-3.14.patch
b/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch
deleted file mode 100644
index 26f7e05073e..00000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
-@@ -91,7 +91,7 @@
-
- def _load_icon_themes(self):
- dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"),
".icons"))
-- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not
os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d,
"index.theme")))
-+ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and
os.path.exists(os.path.join(d, "index.theme")))
- valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
- res = []
- for i in valid:
