[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-11-27 22:20 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-11-27 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     a0634e24ea76261055ba0236baa221b0d5276066
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 22:18:34 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 22:20:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0634e24

gnome-extra/cinnamon: Increase min deps

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 229 ++++++++++++++++++++++++++
 1 file changed, 229 insertions(+)

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
new file mode 100644
index 00000000000..25619ca438c
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -0,0 +1,229 @@
+# 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://developer.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-3.6:0=[introspection]
+	>=gnome-extra/cinnamon-menus-3.6[introspection]
+	>=gnome-extra/cjs-3.6.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.6.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-3.6
+	>=gnome-extra/cinnamon-settings-daemon-3.6
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	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-3.6
+	>=gnome-extra/cinnamon-control-center-3.6
+	>=gnome-extra/cinnamon-screensaver-3.6
+
+	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
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.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 "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-09-27  5:57 Eli Schwartz
  0 siblings, 0 replies; 95+ messages in thread
From: Eli Schwartz @ 2024-09-27  5:57 UTC (permalink / raw
  To: gentoo-commits

commit:     bd4cb2ad8e232461252231c5805d2599d7e908d7
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Sep 26 22:37:04 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 05:55:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4cb2ad

gnome-extra/cinnamon: drop 6.0.4

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-6.0.4.ebuild | 199 -----------------------------
 gnome-extra/cinnamon/metadata.xml          |   1 -
 3 files changed, 201 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 7fc49774105e..6712e17aa1d1 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
 DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11

diff --git a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
deleted file mode 100644
index 7b9098651020..000000000000
--- a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-6.0:0=
-	>=gnome-extra/cinnamon-menus-6.0
-	>=gnome-extra/cjs-6.0[cairo]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/xapp-2.8.2[introspection]
-	>=x11-wm/muffin-6.0[introspection,wayland?]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/python-pam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.1-r2[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-6.0[networkmanager=,wayland?]
-	>=gnome-extra/cinnamon-screensaver-6.0
-	>=gnome-extra/cinnamon-session-6.0
-	>=gnome-extra/cinnamon-settings-daemon-6.0[wayland?]
-	>=gnome-extra/nemo-6.0[wayland?]
-	gnome-extra/polkit-gnome
-	media-libs/gsound
-	net-libs/libsoup:3.0[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-apps/coreutils
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	desktop-portal? (
-		sys-apps/xdg-desktop-portal-gtk
-		sys-apps/xdg-desktop-portal-xapp
-	)
-	nls? (
-		>=gnome-extra/cinnamon-translations-6.0
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-
-	if ! use desktop-portal; then
-		sed -i "s/subdir('xdg-portal')/#&/" data/meson.build || die
-	fi
-
-	if ! use wayland; then
-		sed -i "s/, 'cinnamon-wayland.session'//" meson.build || die
-		sed -i "s/'cinnamon-wayland.desktop',//" data/meson.build || die
-		sed -i "s/subdir('wayland_sessions')/#&/" data/meson.build || die
-		sed -i "s/exec cinnamon-session --session cinnamon-wayland/echo 'wayland support disabled'; exit 1/" \
-			files/usr/bin/cinnamon-session-cinnamon || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}

diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 3eaadcd0d9a0..5170275f61aa 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -13,7 +13,6 @@
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>
 	<use>
-		<flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Cinnamon</flag>
 		<flag name="internal-polkit">Use Cinnamon's internal polkit agent instead of <pkg>gnome-extra/polkit-gnome</pkg>. This does not currently support multi-user fast switching.</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-09-25 14:22 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2024-09-25 14:22 UTC (permalink / raw
  To: gentoo-commits

commit:     17dcd6285ee72af38b2c278dede534870f1c5557
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 14:21:47 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 14:22:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17dcd628

gnome-extra/cinnamon: Stabilize 6.2.9 x86, #940051

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-6.2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
index 9a1350ef9c0c..8c997830c621 100644
--- a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-09-25 13:58 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2024-09-25 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6c46450c973d26f92394eb890f30c0f369ff8fc5
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 13:56:11 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 13:58:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c46450c

gnome-extra/cinnamon: Stabilize 6.2.9 amd64, #940051

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-6.2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
index 58feebb49cfe..9a1350ef9c0c 100644
--- a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-08-23  5:23 Eli Schwartz
  0 siblings, 0 replies; 95+ messages in thread
From: Eli Schwartz @ 2024-08-23  5:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e4f7d2ffe2dbcd3ff93e8ed3ef7570f1016aa52e
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 21:46:23 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 05:21:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f7d2ff

gnome-extra/cinnamon: correct USE dependency on gtk

Actually, it doesn't use gtk's gdk-wayland backend at all, not even
optionally, so the dependencies are effectively runtime-only. On the
other hand, it does use the X11 one! Make sure that it correctly
requires gtk+[X] when built for X11 -- which is always, as it currently
doesn't support the wayland backend in that bit of code at all. Hence
wayland support being masked at the moment. So we simply don't worry
about that at all for now. :)

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-6.2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
index e518322c4ef2..58feebb49cfe 100644
--- a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
+	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?,X]
 	>=x11-libs/libnotify-0.7.3:0=[introspection]
 	x11-libs/libX11
 	>=x11-libs/libXfixes-5.0


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-08-23  5:23 Eli Schwartz
  0 siblings, 0 replies; 95+ messages in thread
From: Eli Schwartz @ 2024-08-23  5:23 UTC (permalink / raw
  To: gentoo-commits

commit:     6b6e41d2adff7a437e54bb7a57f02bbd52a08fee
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 21:43:01 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 05:21:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6e41d2

gnome-extra/cinnamon: use a "more correct" xdg.eclass phase

Avoid calling postinst in postrm, even though they really just share an
impl at the moment.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-6.2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
index faad5075ad15..e518322c4ef2 100644
--- a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -201,6 +201,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	xdg_pkg_postinst
+	xdg_pkg_postrm
 	gnome2_schemas_update
 }


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-08-23  5:23 Eli Schwartz
  0 siblings, 0 replies; 95+ messages in thread
From: Eli Schwartz @ 2024-08-23  5:23 UTC (permalink / raw
  To: gentoo-commits

commit:     320c3f519cfc55453897f6ed2e2eb02129dec95f
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Aug  5 08:28:05 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 05:21:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320c3f51

gnome-extra/cinnamon: drop 6.2.7

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-6.2.7.ebuild | 206 -----------------------------
 2 files changed, 207 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 06532380d032..7fc49774105e 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
-DIST cinnamon-6.2.7.tar.gz 2547822 BLAKE2B 67f15fdd39c7168bcaa03f637fa6a4b9e9076657a92ba92472c69960c0c26fcad7aa0b4e1f6926e57d76364bf4a42f28381b67a03cba75de87a4fc31ef9e7377 SHA512 d8617cf73dd754b91915826527e674a8084ad141831112def661eac6b39b1c39e61e06fdf79bd7f0a7045b2abc29e223f8616796f5e51d1354486f0d0e4faf5a
 DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11

diff --git a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
deleted file mode 100644
index faad5075ad15..000000000000
--- a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-6.2:0=
-	>=gnome-extra/cinnamon-menus-6.2
-	>=gnome-extra/cjs-6.2[cairo]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/xapp-2.8.4[introspection]
-	>=x11-wm/muffin-6.2[introspection,wayland?]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/python-pam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.2[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-6.2[networkmanager=,wayland?]
-	>=gnome-extra/cinnamon-screensaver-6.2
-	>=gnome-extra/cinnamon-session-6.2
-	>=gnome-extra/cinnamon-settings-daemon-6.2[wayland?]
-	>=gnome-extra/nemo-6.2[wayland?]
-	media-libs/gsound
-	net-libs/libsoup:3.0[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-apps/coreutils
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-apps/xdg-desktop-portal-gtk
-	sys-apps/xdg-desktop-portal-xapp
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	!internal-polkit? (
-		gnome-extra/polkit-gnome
-	)
-	nls? (
-		>=gnome-extra/cinnamon-translations-6.2
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}/${PN}-3.8.0-gnome-background-compatibility.patch"
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}/${PN}-3.6.6-wheel-sudo.patch"
-
-	# Make wayland optional
-	# https://github.com/linuxmint/cinnamon/pull/12273
-	"${FILESDIR}/${PN}-6.2.0-optional-wayland.patch"
-
-	# Fix path for settings panels on arm64
-	# https://github.com/linuxmint/cinnamon/pull/12278
-	"${FILESDIR}/${PN}-6.2.0-fix-arm64-settings-panel-path.patch"
-)
-
-src_prepare() {
-	if use internal-polkit; then
-		PATCHES+=(
-			# Use internal polkit agent on X11
-			# https://github.com/linuxmint/cinnamon/pull/12272
-			"${FILESDIR}/${PN}-6.2.0-polkit-agent-on-x11.patch"
-		)
-	else
-		# Add polkit agent to required components
-		# https://github.com/linuxmint/Cinnamon/issues/3579
-		sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-	fi
-
-	default
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		$(meson_use wayland)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/cinnamon/
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}"/usr/bin/cinnamon
-
-	# Doesn't exist by default
-	keepdir /etc/xdg/menus/applications-merged
-
-	if ! use internal-polkit; then
-		# 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
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-08-23  5:23 Eli Schwartz
  0 siblings, 0 replies; 95+ messages in thread
From: Eli Schwartz @ 2024-08-23  5:23 UTC (permalink / raw
  To: gentoo-commits

commit:     6f32268bde71c905cb5932e65312c6cdaf73e5b1
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Aug  5 08:27:00 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 05:21:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f32268b

gnome-extra/cinnamon: add 6.2.9

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-6.2.9.ebuild | 206 +++++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e943e83ca6ca..06532380d032 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
 DIST cinnamon-6.2.7.tar.gz 2547822 BLAKE2B 67f15fdd39c7168bcaa03f637fa6a4b9e9076657a92ba92472c69960c0c26fcad7aa0b4e1f6926e57d76364bf4a42f28381b67a03cba75de87a4fc31ef9e7377 SHA512 d8617cf73dd754b91915826527e674a8084ad141831112def661eac6b39b1c39e61e06fdf79bd7f0a7045b2abc29e223f8616796f5e51d1354486f0d0e4faf5a
+DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11

diff --git a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
new file mode 100644
index 000000000000..faad5075ad15
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	>=gnome-extra/cinnamon-menus-6.2
+	>=gnome-extra/cjs-6.2[cairo]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/xapp-2.8.4[introspection]
+	>=x11-wm/muffin-6.2[introspection,wayland?]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.2[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-6.2[networkmanager=,wayland?]
+	>=gnome-extra/cinnamon-screensaver-6.2
+	>=gnome-extra/cinnamon-session-6.2
+	>=gnome-extra/cinnamon-settings-daemon-6.2[wayland?]
+	>=gnome-extra/nemo-6.2[wayland?]
+	media-libs/gsound
+	net-libs/libsoup:3.0[introspection]
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-apps/coreutils
+	sys-apps/pciutils
+	sys-apps/util-linux
+	sys-apps/xdg-desktop-portal-gtk
+	sys-apps/xdg-desktop-portal-xapp
+	sys-power/upower[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	!internal-polkit? (
+		gnome-extra/polkit-gnome
+	)
+	nls? (
+		>=gnome-extra/cinnamon-translations-6.2
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}/${PN}-3.8.0-gnome-background-compatibility.patch"
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}/${PN}-3.6.6-wheel-sudo.patch"
+
+	# Make wayland optional
+	# https://github.com/linuxmint/cinnamon/pull/12273
+	"${FILESDIR}/${PN}-6.2.0-optional-wayland.patch"
+
+	# Fix path for settings panels on arm64
+	# https://github.com/linuxmint/cinnamon/pull/12278
+	"${FILESDIR}/${PN}-6.2.0-fix-arm64-settings-panel-path.patch"
+)
+
+src_prepare() {
+	if use internal-polkit; then
+		PATCHES+=(
+			# Use internal polkit agent on X11
+			# https://github.com/linuxmint/cinnamon/pull/12272
+			"${FILESDIR}/${PN}-6.2.0-polkit-agent-on-x11.patch"
+		)
+	else
+		# Add polkit agent to required components
+		# https://github.com/linuxmint/Cinnamon/issues/3579
+		sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+	fi
+
+	default
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		$(meson_use wayland)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/cinnamon/
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}"/usr/bin/cinnamon
+
+	# Doesn't exist by default
+	keepdir /etc/xdg/menus/applications-merged
+
+	if ! use internal-polkit; then
+		# 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
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-06-19  5:24 Arthur Zamarin
  0 siblings, 0 replies; 95+ messages in thread
From: Arthur Zamarin @ 2024-06-19  5:24 UTC (permalink / raw
  To: gentoo-commits

commit:     99744d74044a86aa22bce9a4549e032382d32760
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Jun 17 21:50:23 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 05:22:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99744d74

gnome-extra/cinnamon: Stabilize 6.0.4 x86, #932975

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-6.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
index d5b2f85cc1ff..7b9098651020 100644
--- a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-06-02 21:16 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2024-06-02 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     bd10b12306a04085c1eed7b745572600205f458c
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Jun  2 18:48:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 21:15:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd10b123

gnome-extra/cinnamon: Stabilize 6.0.4 amd64, #932975

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-6.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
index 1c2639ba7d27..d5b2f85cc1ff 100644
--- a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-02-15 13:29 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2024-02-15 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     8c534bea00f7f1ff3886ad4bcfcbf721890c2471
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun Jan  7 22:07:25 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 13:29:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c534bea

gnome-extra/cinnamon: add 6.0.4

Closes: https://bugs.gentoo.org/915707
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-6.0.4.ebuild | 199 +++++++++++++++++++++++++++++
 gnome-extra/cinnamon/metadata.xml          |   3 +
 3 files changed, 203 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 8e4b14968f4e..b6630cc84c64 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237
 DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad
+DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c

diff --git a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
new file mode 100644
index 000000000000..1c2639ba7d27
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+IUSE="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-6.0:0=
+	>=gnome-extra/cinnamon-menus-6.0
+	>=gnome-extra/cjs-6.0[cairo]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/xapp-2.8.2[introspection]
+	>=x11-wm/muffin-6.0[introspection,wayland?]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.1-r2[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-6.0[networkmanager=,wayland?]
+	>=gnome-extra/cinnamon-screensaver-6.0
+	>=gnome-extra/cinnamon-session-6.0
+	>=gnome-extra/cinnamon-settings-daemon-6.0[wayland?]
+	>=gnome-extra/nemo-6.0[wayland?]
+	gnome-extra/polkit-gnome
+	media-libs/gsound
+	net-libs/libsoup:3.0[introspection]
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-apps/coreutils
+	sys-apps/pciutils
+	sys-apps/util-linux
+	sys-power/upower[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	desktop-portal? (
+		sys-apps/xdg-desktop-portal-gtk
+		sys-apps/xdg-desktop-portal-xapp
+	)
+	nls? (
+		>=gnome-extra/cinnamon-translations-6.0
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+
+	if ! use desktop-portal; then
+		sed -i "s/subdir('xdg-portal')/#&/" data/meson.build || die
+	fi
+
+	if ! use wayland; then
+		sed -i "s/, 'cinnamon-wayland.session'//" meson.build || die
+		sed -i "s/'cinnamon-wayland.desktop',//" data/meson.build || die
+		sed -i "s/subdir('wayland_sessions')/#&/" data/meson.build || die
+		sed -i "s/exec cinnamon-session --session cinnamon-wayland/echo 'wayland support disabled'; exit 1/" \
+			files/usr/bin/cinnamon-session-cinnamon || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}

diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 10688cfbc38d..24e82c1c597d 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>
+	<use>
+		<flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Cinnamon</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2024-02-15 13:29 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2024-02-15 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     cc98ad98e3d5bfedd8bd512791ceb55dd2b91ac4
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Jan 11 04:20:47 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 13:29:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc98ad98

gnome-extra/cinnamon: drop 5.6.8

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-5.6.8.ebuild | 183 -----------------------------
 2 files changed, 184 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index b6630cc84c64..7591256ae65b 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237
 DIST cinnamon-5.8.4.tar.gz 2517117 BLAKE2B 4c3f452480b9e3ce7713221f1b76c475204b8dc1bb34d42a8faf492b0ca86416bb2fbd3849a7f048fef672ecf4613f06c645ec548159b6c3662b7602142e75e6 SHA512 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
deleted file mode 100644
index 512524a26469..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.6:0=
-	>=gnome-extra/cinnamon-menus-5.6
-	>=gnome-extra/cjs-5.6[cairo]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/xapp-2.4.1[introspection]
-	>=x11-wm/muffin-5.6[introspection]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/python-pam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.0[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.6[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.6
-	>=gnome-extra/cinnamon-session-5.6
-	>=gnome-extra/cinnamon-settings-daemon-5.6
-	>=gnome-extra/nemo-5.6
-	gnome-extra/polkit-gnome
-	media-libs/gsound
-	net-libs/libsoup:2.4[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-apps/coreutils
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.6
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-10-13  7:43 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2023-10-13  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e99644957c0149719c055e95cb48c92dd469b6df
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 07:42:47 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 07:42:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9964495

gnome-extra/cinnamon: Stabilize 5.8.4 x86, #914901

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
index a7df6157b376..c48b4ae8c30e 100644
--- a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-10-04  8:24 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2023-10-04  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     410aad701f0f18fcd08cd4d4e89bb98f5370d22f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  4 08:23:42 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 08:24:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410aad70

gnome-extra/cinnamon: Stabilize 5.8.4 amd64, #914901

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
index 5b96f91a8255..a7df6157b376 100644
--- a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-09-26 15:59 WANG Xuerui
  0 siblings, 0 replies; 95+ messages in thread
From: WANG Xuerui @ 2023-09-26 15:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8bf5dd60b94108e7f99384cc6186755a1635d5ee
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 15:38:21 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 15:58:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf5dd60

gnome-extra/cinnamon: keyword 5.8.4 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
index a95477bd7e77..5b96f91a8255 100644
--- a/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.8.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-06-10 23:05 Andreas Sturmlechner
  0 siblings, 0 replies; 95+ messages in thread
From: Andreas Sturmlechner @ 2023-06-10 23:05 UTC (permalink / raw
  To: gentoo-commits

commit:     69ff3740a8826c3f3503e290d55eeb3619abb3e9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 22:31:46 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 23:04:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ff3740

gnome-extra/cinnamon: drop 5.6.5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-5.6.5.ebuild | 182 -----------------------------
 2 files changed, 183 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 7a2c6a94c8cf..ec278b8af3d6 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-5.6.5.tar.gz 2481833 BLAKE2B af7f5010cba9afac9c37aca60f1d6a730fca9bcfe4860a79e8f7cc903cbff45cde4d650530309c4866eeedd52212a4287221e89e5616b3ab0d0903cad3a33afb SHA512 767a68683f2776a1216ec32c479a84203c8524e7bbf2bd65faf4249a46d1a2ccfae8feb55d664890c1b1cd2061895c79d9bec5a70f126b819baebb19804ac30c
 DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
deleted file mode 100644
index df7709b2c318..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.6:0=
-	>=gnome-extra/cinnamon-menus-5.6
-	>=gnome-extra/cjs-5.6[cairo]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/xapp-2.4.1[introspection]
-	>=x11-wm/muffin-5.6[introspection]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/python-pam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.0[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.6[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.6
-	>=gnome-extra/cinnamon-session-5.6
-	>=gnome-extra/cinnamon-settings-daemon-5.6
-	>=gnome-extra/nemo-5.6
-	gnome-extra/polkit-gnome
-	media-libs/gsound
-	net-libs/libsoup:2.4[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-apps/coreutils
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.6
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-06-05  9:58 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2023-06-05  9:58 UTC (permalink / raw
  To: gentoo-commits

commit:     b95446e0ae589db95b9fbc3f5652d1eedb3cf370
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 09:58:10 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 09:58:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95446e0

gnome-extra/cinnamon: Stabilize 5.6.8 amd64, #907860

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.6.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
index 6fcab82c21a4..512524a26469 100644
--- a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-06-05  9:58 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2023-06-05  9:58 UTC (permalink / raw
  To: gentoo-commits

commit:     61c804e7e2afd62fae270c1fc3d71f7505c0cc2d
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 09:57:41 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 09:58:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c804e7

gnome-extra/cinnamon: Stabilize 5.6.8 x86, #907860

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.6.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
index 11a627c66a36..6fcab82c21a4 100644
--- a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-05-07 22:14 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2023-05-07 22:14 UTC (permalink / raw
  To: gentoo-commits

commit:     0344e9a958dca085962faa8fbf8c8af515d5a72e
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun May  7 07:55:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May  7 22:13:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0344e9a9

gnome-extra/cinnamon: add 5.6.8

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-5.6.8.ebuild | 183 +++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e4f64c537245..30a842f05336 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
 DIST cinnamon-5.6.5.tar.gz 2481833 BLAKE2B af7f5010cba9afac9c37aca60f1d6a730fca9bcfe4860a79e8f7cc903cbff45cde4d650530309c4866eeedd52212a4287221e89e5616b3ab0d0903cad3a33afb SHA512 767a68683f2776a1216ec32c479a84203c8524e7bbf2bd65faf4249a46d1a2ccfae8feb55d664890c1b1cd2061895c79d9bec5a70f126b819baebb19804ac30c
+DIST cinnamon-5.6.8.tar.gz 2483519 BLAKE2B 0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b SHA512 33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
new file mode 100644
index 000000000000..11a627c66a36
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.6.8.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.6:0=
+	>=gnome-extra/cinnamon-menus-5.6
+	>=gnome-extra/cjs-5.6[cairo]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/xapp-2.4.1[introspection]
+	>=x11-wm/muffin-5.6[introspection]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.0[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.6[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.6
+	>=gnome-extra/cinnamon-session-5.6
+	>=gnome-extra/cinnamon-settings-daemon-5.6
+	>=gnome-extra/nemo-5.6
+	gnome-extra/polkit-gnome
+	media-libs/gsound
+	net-libs/libsoup:2.4[introspection]
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-apps/coreutils
+	sys-apps/pciutils
+	sys-apps/util-linux
+	sys-power/upower[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.6
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-05-01  1:43 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2023-05-01  1:43 UTC (permalink / raw
  To: gentoo-commits

commit:     87e5b9552110aadb75608f4eb4755cb73b6a0fbd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 01:41:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 01:41:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e5b955

gnome-extra/cinnamon: Stabilize 5.6.5 x86, #904621

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
index 7746c7729084..df7709b2c318 100644
--- a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2023-05-01  1:43 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2023-05-01  1:43 UTC (permalink / raw
  To: gentoo-commits

commit:     d28e7a2fca2bc991473712fbaaade96939a9cdde
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 01:41:00 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 01:41:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28e7a2f

gnome-extra/cinnamon: Stabilize 5.6.5 amd64, #904621

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
index f7fc09209f89..7746c7729084 100644
--- a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-12-24  7:11 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-12-24  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ee05b306c665f96c41363ca75dc97505b06bd4e9
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Dec 20 01:40:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:04:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee05b306

gnome-extra/cinnamon: Update PYTHON_COMPAT

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
index ad95938cfc7d..cf07a0f75554 100644
--- a/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-11-22  6:20 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-11-22  6:20 UTC (permalink / raw
  To: gentoo-commits

commit:     430f236d1f1041d537bbf04a172087e3ed00f334
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun Nov 20 21:43:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 06:17:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430f236d

gnome-extra/cinnamon: add 5.6.1

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-5.6.1.ebuild | 185 +++++++++++++++++++++++++++++
 2 files changed, 186 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index b529d4986673..2f54b3d74f50 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
 DIST cinnamon-5.4.12.tar.gz 2472187 BLAKE2B 3ecd2a628ddf62bff6fe5e054f0b9c3e47efb532f6d310e5f9ddcca0763f35bc41872878d25dd3a50adb937c74a5e00dcfe7c25e3e4074d5a2fdd23745b41fff SHA512 62982a277ea00660b4e39f780d77fdca87c425f8da8dba404c2b6bd806d56c5967c6cc3999281318eace2ab902e35f4b9f8f723f9bb57abb0e7111d1a30752d7
+DIST cinnamon-5.6.1.tar.gz 2482117 BLAKE2B 9b7f9f9c045adb1497875d7d735b3d8b684869695c3e476f3f8f671840b31a6bd043c8d9f7aca2ab8d1e3fa90d85da454cb612e16a9489e5bfaa7df590a91d3b SHA512 3ec7ce8cd1b2e98283ab84dd55a7e2e1693f6ad5cc7c6db8241808b9d96ab7c375c8739c470b99a83e3b6560ffcc50c070d2439dea71ab0d0792ef7c3bd8cd38

diff --git a/gnome-extra/cinnamon/cinnamon-5.6.1.ebuild b/gnome-extra/cinnamon/cinnamon-5.6.1.ebuild
new file mode 100644
index 000000000000..c677198a6ae4
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.6.1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.6:0=
+	>=gnome-extra/cinnamon-menus-5.6
+	>=gnome-extra/cjs-5.6[cairo]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/xapp-2.4.1[introspection]
+	>=x11-wm/muffin-5.6[introspection]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.0[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.6[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.6
+	>=gnome-extra/cinnamon-session-5.6
+	>=gnome-extra/cinnamon-settings-daemon-5.6
+	>=gnome-extra/nemo-5.6
+	gnome-extra/polkit-gnome
+	media-libs/gsound
+	net-libs/libsoup:2.4[introspection]
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-apps/coreutils
+	sys-apps/pciutils
+	sys-apps/util-linux
+	sys-power/upower[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.6
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-11-22  6:20 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-11-22  6:20 UTC (permalink / raw
  To: gentoo-commits

commit:     5746e89bed0a24bfd58eedf5f4d388e90421014b
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun Nov 20 21:45:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 06:17:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5746e89b

gnome-extra/cinnamon: drop 5.4.12

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/28378
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest               |   1 -
 gnome-extra/cinnamon/cinnamon-5.4.12.ebuild | 182 ----------------------------
 2 files changed, 183 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 2f54b3d74f50..9e1b78ab7b61 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
-DIST cinnamon-5.4.12.tar.gz 2472187 BLAKE2B 3ecd2a628ddf62bff6fe5e054f0b9c3e47efb532f6d310e5f9ddcca0763f35bc41872878d25dd3a50adb937c74a5e00dcfe7c25e3e4074d5a2fdd23745b41fff SHA512 62982a277ea00660b4e39f780d77fdca87c425f8da8dba404c2b6bd806d56c5967c6cc3999281318eace2ab902e35f4b9f8f723f9bb57abb0e7111d1a30752d7
 DIST cinnamon-5.6.1.tar.gz 2482117 BLAKE2B 9b7f9f9c045adb1497875d7d735b3d8b684869695c3e476f3f8f671840b31a6bd043c8d9f7aca2ab8d1e3fa90d85da454cb612e16a9489e5bfaa7df590a91d3b SHA512 3ec7ce8cd1b2e98283ab84dd55a7e2e1693f6ad5cc7c6db8241808b9d96ab7c375c8739c470b99a83e3b6560ffcc50c070d2439dea71ab0d0792ef7c3bd8cd38

diff --git a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
deleted file mode 100644
index 488f5e3d3327..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.4:0=
-	>=gnome-extra/cinnamon-menus-5.4
-	>=gnome-extra/cjs-5.4[cairo]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/xapp-2.2.15[introspection]
-	>=x11-wm/muffin-5.4[introspection]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/python-pam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.2.2[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.4[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.4
-	>=gnome-extra/cinnamon-session-5.4
-	>=gnome-extra/cinnamon-settings-daemon-5.4
-	>=gnome-extra/nemo-5.4
-	gnome-extra/polkit-gnome
-	media-libs/gsound
-	net-libs/libsoup:2.4[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.4
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-10-12 23:09 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-10-12 23:09 UTC (permalink / raw
  To: gentoo-commits

commit:     5aa478fdf0fb9d1bda56eb8971c615b2efa22cc3
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Oct  4 04:26:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 23:04:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa478fd

gnome-extra/cinnamon: 5.4.12

Closes: https://bugs.gentoo.org/863197
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest               |   1 +
 gnome-extra/cinnamon/cinnamon-5.4.12.ebuild | 182 ++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 374d935ffcda..b529d4986673 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1 +1,2 @@
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
+DIST cinnamon-5.4.12.tar.gz 2472187 BLAKE2B 3ecd2a628ddf62bff6fe5e054f0b9c3e47efb532f6d310e5f9ddcca0763f35bc41872878d25dd3a50adb937c74a5e00dcfe7c25e3e4074d5a2fdd23745b41fff SHA512 62982a277ea00660b4e39f780d77fdca87c425f8da8dba404c2b6bd806d56c5967c6cc3999281318eace2ab902e35f4b9f8f723f9bb57abb0e7111d1a30752d7

diff --git a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
new file mode 100644
index 000000000000..e3e3943e4b4d
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.4:0=
+	>=gnome-extra/cinnamon-menus-5.4
+	>=gnome-extra/cjs-5.4[cairo]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/xapp-2.2.15[introspection]
+	>=x11-wm/muffin-5.4[introspection]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.2.2[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.4[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.4
+	>=gnome-extra/cinnamon-session-5.4
+	>=gnome-extra/cinnamon-settings-daemon-5.4
+	>=gnome-extra/nemo-5.4
+	gnome-extra/polkit-gnome
+	media-libs/gsound
+	net-libs/libsoup:2.4[introspection]
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.4
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-10-12 23:09 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-10-12 23:09 UTC (permalink / raw
  To: gentoo-commits

commit:     29a9c7bb12c4e7c6b4120ba3ec79074d87c1d453
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Oct  4 05:22:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 23:04:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29a9c7bb

gnome-extra/cinnamon: Fix license declaration

Update to match upstream debian/copyright declaration.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/27656
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild | 2 +-
 gnome-extra/cinnamon/cinnamon-5.4.12.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild
index 9be3d8520c54..7b00eac96c84 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
 SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ GPL-3 LGPL-2.1"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

diff --git a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
index e3e3943e4b4d..488f5e3d3327 100644
--- a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
 SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-09-07  7:52 Michał Górny
  0 siblings, 0 replies; 95+ messages in thread
From: Michał Górny @ 2022-09-07  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d72b46f0960006af64349a854e39684712e2861c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 19:43:11 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 07:51:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72b46f0

gnome-extra/cinnamon: Update PYTHON_REQ_USE to xml(+)

Update PYTHON_REQ_USE to specify "xml(+)", as Python 3.11 no longer
features the "xml" flag.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index f3850a65ba15..1e5fd0b76c77 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
 


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-05-13 20:07 Jakov Smolić
  0 siblings, 0 replies; 95+ messages in thread
From: Jakov Smolić @ 2022-05-13 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     36fe8228774e72ee1a17b265947c1695d2de6e8f
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 20:07:39 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri May 13 20:07:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36fe8228

gnome-extra/cinnamon: Keyword 5.2.7-r3 arm64, #842033

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index 9c1e92590dd4..f3850a65ba15 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-05-13  4:28 Yixun Lan
  0 siblings, 0 replies; 95+ messages in thread
From: Yixun Lan @ 2022-05-13  4:28 UTC (permalink / raw
  To: gentoo-commits

commit:     bcb4b7ef965a722f2e61d701d7a5c77d5602f0e5
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 04:27:31 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri May 13 04:28:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb4b7ef

gnome-extra/cinnamon: Keyword 5.2.7-r3 riscv, #842033

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index d161aeb40ce5..9c1e92590dd4 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-05-11  2:11 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-05-11  2:11 UTC (permalink / raw
  To: gentoo-commits

commit:     0ca65bbe2e52ae9384086f5923c18b3fb002f394
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue May  3 21:08:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 11 02:10:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca65bbe

gnome-extra/cinnamon: Remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest                 |   1 -
 gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild | 176 ------------------------
 gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild | 186 --------------------------
 3 files changed, 363 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index b167c58a3b6c..374d935ffcda 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
deleted file mode 100644
index d6c3792cf966..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	>=gnome-extra/cinnamon-menus-5.0
-	>=gnome-extra/cjs-5.0[cairo]
-	net-libs/libsoup:2.4[introspection]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.0[introspection]
-
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.0
-	>=gnome-extra/cinnamon-session-5.0
-	>=gnome-extra/cinnamon-settings-daemon-5.0
-	>=gnome-extra/nemo-5.0
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapp-2.2.0[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.0
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild
deleted file mode 100644
index 5237a3b90b2a..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="xml"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.2:0=
-	>=gnome-extra/cinnamon-menus-5.2
-	>=gnome-extra/cjs-5.2[cairo]
-	net-libs/libsoup:2.4[introspection]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.2[introspection]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.2[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.2
-	>=gnome-extra/cinnamon-session-5.2
-	>=gnome-extra/cinnamon-settings-daemon-5.2
-	>=gnome-extra/nemo-5.2
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapp-2.2.8[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.2
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Make evolution-data-server integration optional
-	"${FILESDIR}"/${PN}-5.2.7-eds-detection.patch
-
-	# Meson fixes
-	"${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch
-	"${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-05-05  3:01 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-05-05  3:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b9f6e442a8d5c2834edea992403ee55139f62449
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 03:00:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 03:00:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f6e442

gnome-extra/cinnamon: Stabilize 5.2.7-r3 x86, #841614

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index 6c2c55c618ed..d161aeb40ce5 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-05-05  3:01 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-05-05  3:01 UTC (permalink / raw
  To: gentoo-commits

commit:     7d51295f400d3d03f70edec746660216f1bfd1e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 03:00:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 03:00:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d51295f

gnome-extra/cinnamon: Stabilize 5.2.7-r3 amd64, #841614

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index b0665c090769..6c2c55c618ed 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-05-02  1:11 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-05-02  1:11 UTC (permalink / raw
  To: gentoo-commits

commit:     3093cd59db9df1003d27fec7700a2cd758528221
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 01:09:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  2 01:10:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3093cd59

gnome-extra/cinnamon: switch to dev-python/python-pam

dev-python/pypam is unmaintained upstream and has unexplained
test failures. Upstream Cinnamon uses python-pam and only
falls back to pypam anyway.

Bug: https://bugs.gentoo.org/833297
Thanks-to: Douglas Freed <dwfreed <AT> mtu.edu>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild | 186 ++++++++++++++++++++++++++
 1 file changed, 186 insertions(+)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
new file mode 100644
index 000000000000..b0665c090769
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="xml"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.2:0=
+	>=gnome-extra/cinnamon-menus-5.2
+	>=gnome-extra/cjs-5.2[cairo]
+	net-libs/libsoup:2.4[introspection]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=x11-wm/muffin-5.2[introspection]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.2[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.2
+	>=gnome-extra/cinnamon-session-5.2
+	>=gnome-extra/cinnamon-settings-daemon-5.2
+	>=gnome-extra/nemo-5.2
+	gnome-extra/polkit-gnome
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	>=x11-libs/xapp-2.2.8[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.2
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+	# Make evolution-data-server integration optional
+	"${FILESDIR}"/${PN}-5.2.7-eds-detection.patch
+
+	# Meson fixes
+	"${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch
+	"${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-02-27 23:50 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-02-27 23:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f4e86e4d486928b98edc775a9d4093f1e40aeb88
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun Feb 27 20:04:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 23:49:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e86e4d

gnome-extra/cinnamon: Remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/24371
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.2.7-r1.ebuild | 182 --------------------------
 1 file changed, 182 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r1.ebuild
deleted file mode 100644
index 6ce4247d38e4..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="xml"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.2:0=
-	>=gnome-extra/cinnamon-menus-5.2
-	>=gnome-extra/cjs-5.2[cairo]
-	net-libs/libsoup:2.4[introspection]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.2[introspection]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.2[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.2
-	>=gnome-extra/cinnamon-session-5.2
-	>=gnome-extra/cinnamon-settings-daemon-5.2
-	>=gnome-extra/nemo-5.2
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapp-2.2.8[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.2
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Make evolution-data-server integration optional
-	"${FILESDIR}"/${PN}-5.2.7-eds-detection.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2022-02-18  2:44 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2022-02-18  2:44 UTC (permalink / raw
  To: gentoo-commits

commit:     91faf836ace19ef5d168fae258a1c4bd90cfd68c
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sun Jan 23 19:29:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 02:42:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91faf836

gnome-extra/cinnamon: Add missing dep

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../cinnamon/{cinnamon-5.0.6.ebuild => cinnamon-5.0.6-r1.ebuild}      | 3 ++-
 .../cinnamon/{cinnamon-5.2.7.ebuild => cinnamon-5.2.7-r1.ebuild}      | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
similarity index 98%
rename from gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
rename to gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
index f07b7f6d2201..d6c3792cf966 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,6 +66,7 @@ RDEPEND="
 		dev-python/pyinotify[${PYTHON_USEDEP}]
 		dev-python/pypam[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
 		>=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}]

diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r1.ebuild
similarity index 97%
rename from gnome-extra/cinnamon/cinnamon-5.2.7.ebuild
rename to gnome-extra/cinnamon/cinnamon-5.2.7-r1.ebuild
index 976736f285f6..cf265bb33cc7 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,6 +69,7 @@ RDEPEND="
 		dev-python/pyinotify[${PYTHON_USEDEP}]
 		dev-python/pypam[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/tinycss2[${PYTHON_USEDEP}]
 		>=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}]
@@ -112,6 +113,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
 
 	# Make evolution-data-server integration optional
+	# https://github.com/linuxmint/cinnamon/pull/10567
 	"${FILESDIR}"/${PN}-5.2.7-optional-eds.patch
 )
 


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-12-24 20:00 Jakov Smolić
  0 siblings, 0 replies; 95+ messages in thread
From: Jakov Smolić @ 2021-12-24 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     6a44efc76d9cdfd844ef9e8ec739f1209f995232
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 20:00:00 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 20:00:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a44efc7

gnome-extra/cinnamon: Stabilize 5.0.6 x86, #829736

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
index ceba1135b616..ffd267b82e46 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-12-24 19:25 Jakov Smolić
  0 siblings, 0 replies; 95+ messages in thread
From: Jakov Smolić @ 2021-12-24 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     530ac25db87c5f5e8db30dfaafd40e33c3c9d055
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 19:25:12 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 19:25:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530ac25d

gnome-extra/cinnamon: Stabilize 5.0.6 amd64, #829736

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
index 2d9b16d283a0..ceba1135b616 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-11-23  1:25 Yixun Lan
  0 siblings, 0 replies; 95+ messages in thread
From: Yixun Lan @ 2021-11-23  1:25 UTC (permalink / raw
  To: gentoo-commits

commit:     ae284a21d1f93c38983966c5d26c6429cd0c2a45
Author:     Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Sat Nov 20 12:55:27 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 01:10:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae284a21

gnome-extra/cinnamon: keyword ~riscv

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-5.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
index 521a040ceb66..2d9b16d283a0 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-10-20  1:14 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2021-10-20  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     0db5bc0e2488799ac744694978261fde08e5137f
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Oct 18 02:09:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 01:11:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db5bc0e

gnome-extra/cinnamon: 5.0.6 version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-5.0.6.ebuild | 175 +++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 1231e7f1213..e4cdc0b9af5 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
 DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb
+DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
new file mode 100644
index 00000000000..521a040ceb6
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	>=gnome-extra/cinnamon-menus-5.0
+	>=gnome-extra/cjs-5.0[cairo]
+	net-libs/libsoup:2.4[introspection]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=x11-wm/muffin-5.0[introspection]
+
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.0
+	>=gnome-extra/cinnamon-session-5.0
+	>=gnome-extra/cinnamon-settings-daemon-5.0
+	>=gnome-extra/nemo-5.0
+	gnome-extra/polkit-gnome
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	>=x11-libs/xapps-2.2.0[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.0
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-10-20  1:14 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2021-10-20  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     d50a285a3ddb1fd3789cb2baf5c3cdfafbc88f14
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Oct 18 02:10:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 01:11:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50a285a

gnome-extra/cinnamon: Remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/22618
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-5.0.5.ebuild | 175 -----------------------------
 2 files changed, 176 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e4cdc0b9af5..452bd8bfd49 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
-DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb
 DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
deleted file mode 100644
index 521a040ceb6..00000000000
--- a/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	>=gnome-extra/cinnamon-menus-5.0
-	>=gnome-extra/cjs-5.0[cairo]
-	net-libs/libsoup:2.4[introspection]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.0[introspection]
-
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.0
-	>=gnome-extra/cinnamon-session-5.0
-	>=gnome-extra/cinnamon-settings-daemon-5.0
-	>=gnome-extra/nemo-5.0
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.2.0[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.0
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-07-31  8:36 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2021-07-31  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     1605a77a18877a19f2efef8593097c6b5b87f224
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sat Jul 24 20:23:23 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 08:35:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1605a77a

gnome-extra/cinnamon: 5.0.5 version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-5.0.5.ebuild | 175 +++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 9096cf6a15e..5ce7329cf08 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
 DIST cinnamon-5.0.4.tar.gz 2397469 BLAKE2B d71d5c0a1d6386f77951629491fbc14f1c6e139b2a1f7ed87684ed3588897deecfe0158478ca52af18b18da250e8415822f56ce3ca758053a4b373b691627c6b SHA512 ac3eb6384fcbacab77a8a7bff1f28572df4ee62d3e9f0e0d02f9406ef690b3093355652201194d4c324bc13b6f806d27715434701a57c3b7544ad715aee27ad1
+DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
new file mode 100644
index 00000000000..521a040ceb6
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	>=gnome-extra/cinnamon-menus-5.0
+	>=gnome-extra/cjs-5.0[cairo]
+	net-libs/libsoup:2.4[introspection]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=x11-wm/muffin-5.0[introspection]
+
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.0
+	>=gnome-extra/cinnamon-session-5.0
+	>=gnome-extra/cinnamon-settings-daemon-5.0
+	>=gnome-extra/nemo-5.0
+	gnome-extra/polkit-gnome
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	>=x11-libs/xapps-2.2.0[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.0
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-07-31  8:36 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2021-07-31  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     eec27ea30eee2802803302d12baafabf9d77bd7b
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sat Jul 24 20:24:56 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 08:35:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec27ea3

gnome-extra/cinnamon: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/21788
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-5.0.4.ebuild | 175 -----------------------------
 2 files changed, 176 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 5ce7329cf08..1231e7f1213 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
-DIST cinnamon-5.0.4.tar.gz 2397469 BLAKE2B d71d5c0a1d6386f77951629491fbc14f1c6e139b2a1f7ed87684ed3588897deecfe0158478ca52af18b18da250e8415822f56ce3ca758053a4b373b691627c6b SHA512 ac3eb6384fcbacab77a8a7bff1f28572df4ee62d3e9f0e0d02f9406ef690b3093355652201194d4c324bc13b6f806d27715434701a57c3b7544ad715aee27ad1
 DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
deleted file mode 100644
index 521a040ceb6..00000000000
--- a/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+gstreamer gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	>=gnome-extra/cinnamon-menus-5.0
-	>=gnome-extra/cjs-5.0[cairo]
-	net-libs/libsoup:2.4[introspection]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=x11-wm/muffin-5.0[introspection]
-
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.0
-	>=gnome-extra/cinnamon-session-5.0
-	>=gnome-extra/cinnamon-settings-daemon-5.0
-	>=gnome-extra/nemo-5.0
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.2.0[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.0
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Add polkit agent to required components
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/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 "${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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		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
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-07-15 11:32 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2021-07-15 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f228f90259bd5cdf0c2a2097356275b788125594
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Sat Jun 26 06:12:41 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 11:32:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f228f902

gnome-extra/cinnamon: 5.0.4 version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest                                     | 2 +-
 .../cinnamon/{cinnamon-5.0.2.ebuild => cinnamon-5.0.4.ebuild}     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 5445a03c09f..9096cf6a15e 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,2 @@
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
-DIST cinnamon-5.0.2.tar.gz 2395838 BLAKE2B fe7962f4d6481a1584700b3ad5495d2cdc79c4f61aa01b7e330929ff83150ca9a024a00bece4df0fbd18dc68df164c5c27024320c8e46041ae1eaa7c36c8c620 SHA512 f75e9f8382b27b0b29d37274b8687f861c6b46a46b378ee297024069ad70e0e5b48089cd724210148d657d25bcce5d3f18b6ba4826b8ff582c0c1afb5fef9578
+DIST cinnamon-5.0.4.tar.gz 2397469 BLAKE2B d71d5c0a1d6386f77951629491fbc14f1c6e139b2a1f7ed87684ed3588897deecfe0158478ca52af18b18da250e8415822f56ce3ca758053a4b373b691627c6b SHA512 ac3eb6384fcbacab77a8a7bff1f28572df4ee62d3e9f0e0d02f9406ef690b3093355652201194d4c324bc13b6f806d27715434701a57c3b7544ad715aee27ad1

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
similarity index 95%
rename from gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
rename to gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
index f8888fcdd16..521a040ceb6 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
@@ -128,16 +128,15 @@ src_configure() {
 		$(meson_use gstreamer build_recorder)
 		$(meson_use gtk-doc docs)
 		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
 	)
 	meson_src_configure
 }
 
 src_install() {
-	python_domodule files/usr/lib/python3/dist-packages/cinnamon
-	rm -rf files/usr/lib/python3 || die
-
 	meson_src_install
 
+	python_optimize "${D}$(python_get_sitedir)"
 	python_optimize "${ED}"/usr/share/cinnamon/
 
 	# Required for gnome-shell on hardened/PaX, bug #398941
@@ -165,7 +164,8 @@ pkg_postinst() {
 			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
 		fi
 	else
-		ewarn "Cinnamon's built-in screen recording utility is disabled."
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-06-12  3:55 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2021-06-12  3:55 UTC (permalink / raw
  To: gentoo-commits

commit:     035b8c7ddbe2114cc92a56c21876339f8043ef04
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Jun 11 16:53:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 03:55:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035b8c7d

gnome-extra/cinnamon: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Closes: https://github.com/gentoo/gentoo/pull/21205
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 181 -----------------------------
 2 files changed, 182 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index cbab11c2bfa..5445a03c09f 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
 DIST cinnamon-5.0.2.tar.gz 2395838 BLAKE2B fe7962f4d6481a1584700b3ad5495d2cdc79c4f61aa01b7e330929ff83150ca9a024a00bece4df0fbd18dc68df164c5c27024320c8e46041ae1eaa7c36c8c620 SHA512 f75e9f8382b27b0b29d37274b8687f861c6b46a46b378ee297024069ad70e0e5b48089cd724210148d657d25bcce5d3f18b6ba4826b8ff582c0c1afb5fef9578

diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
deleted file mode 100644
index eceb8c0e5f4..00000000000
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 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-1.29.15:=
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-4.6:0=
-	>=gnome-extra/cinnamon-menus-4.6
-	>=gnome-extra/cjs-4.6[cairo]
-	>=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.12.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-4.0.3[introspection]
-	dev-libs/keybinder:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[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. imaging, lxml needed for cinnamon-settings
-# 9. adwaita-icon-theme 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
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-4.6
-	>=gnome-extra/cinnamon-settings-daemon-4.6
-
-	>=app-accessibility/caribou-0.3
-
-	dev-libs/libtimezonemap
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-	')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-4.6
-	>=gnome-extra/cinnamon-control-center-4.6[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-4.6
-
-	gnome-extra/polkit-gnome
-
-	nls? ( >=gnome-extra/cinnamon-translations-4.6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-	gnome2_disable_deprecation_warning
-
-	# 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/cinnamon*.session.in || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--enable-compile-warnings=minimum \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		$(use_enable gtk-doc) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	python_optimize "${ED}"/usr/share/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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	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
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-06-08  7:34 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2021-06-08  7:34 UTC (permalink / raw
  To: gentoo-commits

commit:     e9fc59561348b6a77cc301c7d20384d277a4d9c7
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Jun  1 18:33:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 07:34:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fc5956

gnome-extra/cinnamon: 5.0.2 version bump

Closes: https://bugs.gentoo.org/792933
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-5.0.2.ebuild | 175 +++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 4b8090b8a3d..cbab11c2bfa 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
+DIST cinnamon-5.0.2.tar.gz 2395838 BLAKE2B fe7962f4d6481a1584700b3ad5495d2cdc79c4f61aa01b7e330929ff83150ca9a024a00bece4df0fbd18dc68df164c5c27024320c8e46041ae1eaa7c36c8c620 SHA512 f75e9f8382b27b0b29d37274b8687f861c6b46a46b378ee297024069ad70e0e5b48089cd724210148d657d25bcce5d3f18b6ba4826b8ff582c0c1afb5fef9578

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
new file mode 100644
index 00000000000..f8888fcdd16
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	>=gnome-extra/cinnamon-menus-5.0
+	>=gnome-extra/cjs-5.0[cairo]
+	net-libs/libsoup:2.4[introspection]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=x11-wm/muffin-5.0[introspection]
+
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.0
+	>=gnome-extra/cinnamon-session-5.0
+	>=gnome-extra/cinnamon-settings-daemon-5.0
+	>=gnome-extra/nemo-5.0
+	gnome-extra/polkit-gnome
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	>=x11-libs/xapps-2.2.0[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.0
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	python_domodule files/usr/lib/python3/dist-packages/cinnamon
+	rm -rf files/usr/lib/python3 || die
+
+	meson_src_install
+
+	python_optimize "${ED}"/usr/share/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 "${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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-06-01 16:28 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2021-06-01 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     932a696a920ec6d4753189fa9a312e73cc2db264
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 16:27:14 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 16:28:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932a696a

gnome-extra/cinnamon: stabilize 4.8.6 on x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-4.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
index 8b959450d8d..366b2ae066d 100644
--- a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-06-01 16:28 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2021-06-01 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     b7d61628c1c7335a95a4e861131c850334397d4d
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 16:27:34 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 16:28:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d61628

gnome-extra/cinnamon: stabilize 4.8.6 on amd64, #793344

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-4.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
index 366b2ae066d..768aacbecf1 100644
--- a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2021-01-06  1:05 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2021-01-06  1:05 UTC (permalink / raw
  To: gentoo-commits

commit:     15a1f71215fad75c5dc8ec1785b4feb03044f841
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 01:05:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 01:05:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a1f712

gnome-extra/cinnamon: Stabilize 4.6.7 x86, #761996

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
index 0ffc7d80624..ae2335f17f0 100644
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2020-12-29 17:14 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2020-12-29 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     f535a99e07c4858a825bc32a46313d7d1a956101
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 17:14:22 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 17:14:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f535a99e

gnome-extra/cinnamon: Stabilize 4.6.7 amd64, #761996

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
index 99704c76680..0ffc7d80624 100644
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2020-12-27  5:06 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2020-12-27  5:06 UTC (permalink / raw
  To: gentoo-commits

commit:     a397db4600e452c457f7511e5d5dc705303095b3
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Dec 24 06:46:22 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 05:06:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a397db46

gnome-extra/cinnamon: Remove old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-4.4.8.ebuild | 176 -----------------------------
 2 files changed, 177 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index c586ce36dba..8bcf7676aeb 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
 DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070

diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
deleted file mode 100644
index 8fb8410e1ee..00000000000
--- a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-
-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"
-
-IUSE="gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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-1.29.15:=
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-4.4:0=
-	>=gnome-extra/cinnamon-menus-4.4
-	>=gnome-extra/cjs-4.4.0[cairo]
-	>=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.12.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-4.0.3[introspection]
-	dev-libs/keybinder:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[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. 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
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-4.4
-	>=gnome-extra/cinnamon-settings-daemon-4.4
-
-	>=app-accessibility/caribou-0.3
-
-	dev-libs/libtimezonemap
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-	')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-4.4
-	>=gnome-extra/cinnamon-control-center-4.4[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-4.4
-
-	gnome-extra/polkit-gnome
-
-	nls? ( >=gnome-extra/cinnamon-translations-4.4 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-	gtk-doc? ( dev-util/gtk-doc )
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# 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/cinnamon*.session.in || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		$(use_enable gtk-doc) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/share/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
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2020-12-16 22:30 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2020-12-16 22:30 UTC (permalink / raw
  To: gentoo-commits

commit:     fa6eacac7295c7d977ab6ef09f02c439e8428973
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 22:25:15 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 22:30:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6eacac

gnome-extra/cinnamon: arm64 keyworded (bug #752987)

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
index acc18a5644a..99704c76680 100644
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2020-09-15 14:20 Joonas Niilola
  0 siblings, 0 replies; 95+ messages in thread
From: Joonas Niilola @ 2020-09-15 14:20 UTC (permalink / raw
  To: gentoo-commits

commit:     094b15e5698792c459ce4275910d4aab647b6e90
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 14:15:35 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 14:20:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094b15e5

gnome-extra/cinnamon: remove cinnamon project

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon/metadata.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 5070fef67ad..433968db74e 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sparky@bluefang-logic.com</email>
-		<name>Matthew Turnbull</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2020-09-09  2:15 Sam James
  0 siblings, 0 replies; 95+ messages in thread
From: Sam James @ 2020-09-09  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3da04b78334de3e834a8eea2d150478c67dc62cf
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Wed Jul 29 16:19:10 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 02:15:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da04b78

gnome-extra/cinnamon: 4.6.7 version bump

Switch to EAPI=7.

Closes: https://bugs.gentoo.org/733544
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 181 +++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 62012379d1a..c586ce36dba 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1 +1,2 @@
 DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
+DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070

diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
new file mode 100644
index 00000000000..acc18a5644a
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+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-1.29.15:=
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-4.6:0=
+	>=gnome-extra/cinnamon-menus-4.6
+	>=gnome-extra/cjs-4.6[cairo]
+	>=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.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.3[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[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. imaging, lxml needed for cinnamon-settings
+# 9. adwaita-icon-theme 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
+	sys-power/upower[introspection]
+
+	>=gnome-extra/cinnamon-session-4.6
+	>=gnome-extra/cinnamon-settings-daemon-4.6
+
+	>=app-accessibility/caribou-0.3
+
+	dev-libs/libtimezonemap
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/xapp[${PYTHON_USEDEP}]
+	')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-4.6
+	>=gnome-extra/cinnamon-control-center-4.6[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-4.6
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+	gnome2_disable_deprecation_warning
+
+	# 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/cinnamon*.session.in || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		$(use_enable gtk-doc) \
+		$(use_enable networkmanager) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	python_optimize "${ED}"/usr/share/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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	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
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2020-05-29  0:11 Matt Turner
  0 siblings, 0 replies; 95+ messages in thread
From: Matt Turner @ 2020-05-29  0:11 UTC (permalink / raw
  To: gentoo-commits

commit:     8da71837558fd68d32a72b8b7b5fb88071e78ecc
Author:     Matthew Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Wed May 13 05:52:22 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 29 00:10:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da71837

gnome-extra/cinnamon: 4.4.8 version bump

Update cinnamon to 4.4.8. Re-work python support
as python-single-r1 with python3_{6,7} compat.
Clean-up dependencies and make networkmanager optional.

Closes: https://bugs.gentoo.org/553946
Closes: https://bugs.gentoo.org/704532
Closes: https://bugs.gentoo.org/662546
Closes: https://bugs.gentoo.org/709016
Bug: https://bugs.gentoo.org/718316
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-4.4.8.ebuild | 176 +++++++++++++++++++++++++++++
 gnome-extra/cinnamon/metadata.xml          |   8 ++
 3 files changed, 185 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 8e3d2161a95..396de5e690f 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1 +1,2 @@
 DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
+DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978

diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
new file mode 100644
index 00000000000..8fb8410e1ee
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+
+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"
+
+IUSE="gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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-1.29.15:=
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-4.4:0=
+	>=gnome-extra/cinnamon-menus-4.4
+	>=gnome-extra/cjs-4.4.0[cairo]
+	>=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.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.3[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[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. 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
+	sys-power/upower[introspection]
+
+	>=gnome-extra/cinnamon-session-4.4
+	>=gnome-extra/cinnamon-settings-daemon-4.4
+
+	>=app-accessibility/caribou-0.3
+
+	dev-libs/libtimezonemap
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/xapp[${PYTHON_USEDEP}]
+	')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-4.4
+	>=gnome-extra/cinnamon-control-center-4.4[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-4.4
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.4 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!=dev-lang/spidermonkey-1.8.2*
+	gtk-doc? ( dev-util/gtk-doc )
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+	# 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/cinnamon*.session.in || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		$(use_enable gtk-doc) \
+		$(use_enable networkmanager) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/share/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
+}

diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 216784b94f4..5070fef67ad 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -5,6 +5,14 @@
 		<email>cinnamon@gentoo.org</email>
 		<name>Cinnamon Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2019-08-18 12:37 David Seifert
  0 siblings, 0 replies; 95+ messages in thread
From: David Seifert @ 2019-08-18 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b465dc3ca1a534e3ea68368340ded8cea98a8531
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 12:33:06 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 12:37:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b465dc3c

gnome-extra/cinnamon: [QA] Fix trailing whitespace

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index de4728de28e..22156a2c19f 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -82,7 +82,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection] 
+	sys-power/upower[introspection]
 
 	>=gnome-extra/cinnamon-session-3.6
 	>=gnome-extra/cinnamon-settings-daemon-3.6


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2019-06-07 20:12 Mikle Kolyada
  0 siblings, 0 replies; 95+ messages in thread
From: Mikle Kolyada @ 2019-06-07 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     020233cab91cff59eb06fa678ef35c4bbe5d641f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 20:11:11 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 20:11:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020233ca

gnome-extra/cinnamon: amd64 stable wrt bug #687348

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
index 4f3f0ec4da3..013fce419f1 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( $(python_gen_useflags 'python3*') )
 "
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2019-06-04 20:58 Thomas Deutschmann
  0 siblings, 0 replies; 95+ messages in thread
From: Thomas Deutschmann @ 2019-06-04 20:58 UTC (permalink / raw
  To: gentoo-commits

commit:     4e8235c6f19681bb1ad4adcfa18d594004eea555
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 20:28:12 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 20:57:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8235c6

gnome-extra/cinnamon: x86 stable (bug #687348)

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
index 01d93daa666..4f3f0ec4da3 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( $(python_gen_useflags 'python3*') )
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2019-04-24 16:28 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2019-04-24 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     38d1f7027543750f02641e9a08a3147faef24a43
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 16:19:54 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 16:19:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d1f702

gnome-extra/cinnamon: gconf is not really needed anymore

Closes: https://bugs.gentoo.org/640038
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild | 207 ++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)

diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
new file mode 100644
index 00000000000..d35a2bceb26
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+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://developer.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"
+
+IUSE="+nls"
+
+# 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/librsvg
+	>=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
+	>=gnome-extra/cinnamon-menus-4.0[introspection]
+	>=gnome-extra/cjs-4.0.0[cairo]
+	>=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.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.0[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[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. 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]
+
+	>=gnome-extra/cinnamon-session-4.0
+	>=gnome-extra/cinnamon-settings-daemon-4.0
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(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-4.0
+	>=gnome-extra/cinnamon-control-center-4.0
+	>=gnome-extra/cinnamon-screensaver-4.0
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
+"
+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}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.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
+
+	# 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)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# 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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2018-12-08 22:11 Mikle Kolyada
  0 siblings, 0 replies; 95+ messages in thread
From: Mikle Kolyada @ 2018-12-08 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     9672a7a2ff32898c692d7d47cf000f1287a11506
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 22:11:46 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 22:11:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9672a7a2

gnome-extra/cinnamon: [QA] remove sys-power/upower-pm-utils dependency

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 4 ++--
 gnome-extra/cinnamon/cinnamon-3.8.8.ebuild    | 4 ++--
 gnome-extra/cinnamon/cinnamon-4.0.3.ebuild    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 504464fac2a..17cda987055 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -82,7 +82,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 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] )
+	sys-power/upower[introspection] 
 
 	>=gnome-extra/cinnamon-session-3.6
 	>=gnome-extra/cinnamon-settings-daemon-3.6

diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
index 26e4c59984c..5be06789368 100644
--- a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,7 +76,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 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] )
+	sys-power/upower[introspection]
 
 	>=gnome-extra/cinnamon-session-3.8
 	>=gnome-extra/cinnamon-settings-daemon-3.8

diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
index bd5ffbd202e..817f2262cd3 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
@@ -78,7 +78,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 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] )
+	sys-power/upower[introspection]
 
 	>=gnome-extra/cinnamon-session-4.0
 	>=gnome-extra/cinnamon-settings-daemon-4.0


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2018-11-28 19:56 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2018-11-28 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     999d64da43c7547c07e76226e7ded7fd3568e302
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 24 18:25:45 2018 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 19:55:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=999d64da

gnome-extra/cinnamon: New upstream version 4.0.3

Closes: https://bugs.gentoo.org/671296
Closes: https://bugs.gentoo.org/666388
Closes: https://bugs.gentoo.org/666386
Closes: https://bugs.gentoo.org/666382

Signed-off-by: Kristian Fiskerstrand <k_f <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-4.0.3.ebuild | 209 +++++++++++++++++++++++++++++
 2 files changed, 210 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index d50a6456091..cac23ce7ae5 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
 DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53
+DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1

diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
new file mode 100644
index 00000000000..bd5ffbd202e
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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,3_6} )
+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://developer.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"
+
+IUSE="+nls"
+
+# 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-4.0:0=[introspection]
+	>=gnome-extra/cinnamon-menus-4.0[introspection]
+	>=gnome-extra/cjs-4.0.0[cairo]
+	>=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.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.0[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[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-4.0
+	>=gnome-extra/cinnamon-settings-daemon-4.0
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	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-4.0
+	>=gnome-extra/cinnamon-control-center-4.0
+	>=gnome-extra/cinnamon-screensaver-4.0
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
+"
+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}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.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
+
+	# 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)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# 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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2018-06-23 10:14 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2018-06-23 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     5a4c72786ef5733442b4086ff048dc31f3e1e903
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 10:13:37 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 10:13:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4c7278

gnome-extra/cinnamon: Support python3.6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index ea7b3ca6098..504464fac2a 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2018-04-12 19:07 Thomas Deutschmann
  0 siblings, 0 replies; 95+ messages in thread
From: Thomas Deutschmann @ 2018-04-12 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e1fb4e4b8b8bae2ce387c6fde35ee11fa20badc8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 18:53:46 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 19:06:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fb4e4b

gnome-extra/cinnamon: x86 stable (bug #639618)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 696a68bd694..ea7b3ca6098 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( $(python_gen_useflags 'python3*') )
 "
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2018-04-06 14:00 Aaron Bauman
  0 siblings, 0 replies; 95+ messages in thread
From: Aaron Bauman @ 2018-04-06 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ef02196a702f7c4e78406da98534203e80d19dd6
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 13:57:38 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 13:57:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef02196a

gnome-extra/cinnamon: amd64 stable

Bug: https://bugs.gentoo.org/639618
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 25619ca438c..696a68bd694 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( $(python_gen_useflags 'python3*') )
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-11-27 22:20 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-11-27 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     88b3f2734d3f0eed6a956e20fb524e5d717ea5db
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 22:19:17 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 22:20:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b3f273

gnome-extra/cinnamon: Cleanup old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 gnome-extra/cinnamon/cinnamon-3.6.6-r1.ebuild | 229 --------------------------
 gnome-extra/cinnamon/cinnamon-3.6.6.ebuild    | 227 -------------------------
 2 files changed, 456 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r1.ebuild
deleted file mode 100644
index 8ecd59c4bce..00000000000
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r1.ebuild
+++ /dev/null
@@ -1,229 +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://developer.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-3.0[introspection]
-	>=gnome-extra/cjs-3.2.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.2.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
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	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
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.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 "<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.6.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
deleted file mode 100644
index 23734530bbd..00000000000
--- a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
+++ /dev/null
@@ -1,227 +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://developer.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-3.6:0=[introspection]
-	>=gnome-extra/cinnamon-menus-3.6[introspection]
-	>=gnome-extra/cjs-3.6.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.6.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
-	x11-libs/xapps[introspection]
-
-	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-3.6
-	>=gnome-extra/cinnamon-control-center-3.6
-	>=gnome-extra/cinnamon-screensaver-3.6
-
-	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
-
-	# 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 "<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
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-11-26 15:43 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-11-26 15:43 UTC (permalink / raw
  To: gentoo-commits

commit:     61bd2ca245bb9fbbb6f4decc4cf5c2b04a4f7f70
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 14:59:09 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 15:11:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61bd2ca2

gnome-extra/cinnamon: Version bump 3.6.6

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 gnome-extra/cinnamon/Manifest              |   3 +-
 gnome-extra/cinnamon/cinnamon-3.6.6.ebuild | 227 +++++++++++++++++++++++++++++
 2 files changed, 229 insertions(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 3b781cf1687..9e4f71e7612 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,4 +3,5 @@ DIST cinnamon-3.2.0.tar.gz 2216495 SHA256 c1473aabb01329c07bf1e28148cb410255700f
 DIST cinnamon-3.2.6.tar.gz 2225445 SHA256 ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb WHIRLPOOL 2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f
 DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942
 DIST cinnamon-3.4.2.tar.gz 2213346 SHA256 182ed619f92831b83e9bfd89803bbd750c6cb0ee9d097120cdd40eb19d41e302 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 WHIRLPOOL 27a508e693d32c1c297df545028ca3737a15e91de197f52fbb41854b3b1f7aa813e20d6062fb1ece432166004651c4cf17d38551a1e79bc2ea1c1f652d96b76f
-DIST cinnamon-3.4.6.tar.gz 2217209 SHA256 857cd68ca4744332e9b20456ae3a0d63ee8a3eacd108ec82dd26b124765a45b4 SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd WHIRLPOOL fcc2d2ea60099e021e6a761d7a519bc773430d128506d38f0d7653d586d79c3019af8c739b2b013dc3faadfbecae8643f5aa87c4137e9da5098e337623620f4f
+DIST cinnamon-3.4.6.tar.gz 2217209 BLAKE2B 87a01ffe8806fd7d252035533be25bd197e06f29f02644197132a9d5fa3eb766760fb0df5fc00c61e5f35b3d45b8464824def510e233fa93c84038c28aea5ccc SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd
+DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642

diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
new file mode 100644
index 00000000000..16d2c5e028c
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
@@ -0,0 +1,227 @@
+# 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://developer.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-3.0[introspection]
+	>=gnome-extra/cjs-3.2.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.2.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
+	x11-libs/xapps[introspection]
+
+	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
+
+	# 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 "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-09-05 19:45 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-09-05 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     7770c857c3477dc7a60fd867f9b4440dd40a93e7
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 19:41:55 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 19:43:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7770c857

gnome-extra/cinnamon: New upstream version 3.4.6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-3.4.6.ebuild | 234 +++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 570957fff2b..3b781cf1687 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,3 +3,4 @@ DIST cinnamon-3.2.0.tar.gz 2216495 SHA256 c1473aabb01329c07bf1e28148cb410255700f
 DIST cinnamon-3.2.6.tar.gz 2225445 SHA256 ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb WHIRLPOOL 2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f
 DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942
 DIST cinnamon-3.4.2.tar.gz 2213346 SHA256 182ed619f92831b83e9bfd89803bbd750c6cb0ee9d097120cdd40eb19d41e302 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 WHIRLPOOL 27a508e693d32c1c297df545028ca3737a15e91de197f52fbb41854b3b1f7aa813e20d6062fb1ece432166004651c4cf17d38551a1e79bc2ea1c1f652d96b76f
+DIST cinnamon-3.4.6.tar.gz 2217209 SHA256 857cd68ca4744332e9b20456ae3a0d63ee8a3eacd108ec82dd26b124765a45b4 SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd WHIRLPOOL fcc2d2ea60099e021e6a761d7a519bc773430d128506d38f0d7653d586d79c3019af8c739b2b013dc3faadfbecae8643f5aa87c4137e9da5098e337623620f4f

diff --git a/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild
new file mode 100644
index 00000000000..7a62d8ff83f
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild
@@ -0,0 +1,234 @@
+# 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://developer.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-3.0[introspection]
+	>=gnome-extra/cjs-3.2.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.2.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
+	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 "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-07-28 14:27 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-07-28 14:27 UTC (permalink / raw
  To: gentoo-commits

commit:     11dbcb3a4ce477fd1e33bda4f2599221892fa430
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 14:25:11 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 14:27:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11dbcb3a

gnome-extra/cinnamon: Increase version dependency for x11-wm/muffin to 3.2.0

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../cinnamon/{cinnamon-3.4.2.ebuild => cinnamon-3.4.2-r1.ebuild}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
similarity index 99%
rename from gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
rename to gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
index 448c84c7bb4..7a62d8ff83f 100644
--- a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=x11-libs/startup-notification-0.11
 	x11-libs/libX11
 	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-3.0.0[introspection]
+	>=x11-wm/muffin-3.2.0[introspection]
 	networkmanager? (
 		gnome-base/libgnome-keyring
 		>=net-misc/networkmanager-0.8.999:=[introspection] )


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-06-24 19:56 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-06-24 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     34ad29fec60138665a6f79138ba77bb18e0e0621
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 19:55:32 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 19:56:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ad29fe

gnome-extra/cinnamon: Add explicit version for cinnamon-menu dep

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 gnome-extra/cinnamon/cinnamon-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
index f9818b3fe3c..448c84c7bb4 100644
--- a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	gnome-base/gconf:2[introspection]
 	gnome-base/librsvg
 	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cinnamon-menus-3.0[introspection]
 	>=gnome-extra/cjs-3.2.0
 	>=media-libs/clutter-1.10:1.0[introspection]
 	media-libs/cogl:1.0=[introspection]


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-06-24 19:41 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-06-24 19:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e54e94b42ba47c0ab1b64f0a139ef3258f4dd878
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 19:40:25 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 19:41:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54e94b4

gnome-extra/cinnamon: Update min dep on cjs

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 gnome-extra/cinnamon/cinnamon-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
index f6e7e06c70f..f9818b3fe3c 100644
--- a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	gnome-base/librsvg
 	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
 	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.8.0
+	>=gnome-extra/cjs-3.2.0
 	>=media-libs/clutter-1.10:1.0[introspection]
 	media-libs/cogl:1.0=[introspection]
 	>=gnome-base/gsettings-desktop-schemas-2.91.91


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-06-24 14:58 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-06-24 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     e7da53f26efdad02611cbf7b8fcec9fcb9ba5da9
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 14:43:44 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 14:58:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7da53f2

gnome-extra/cinnamon: New upstream version 3.4.2

Gentoo-Bug: 618502

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-3.4.2.ebuild | 234 +++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 6566485a98a..570957fff2b 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,3 +2,4 @@ DIST cinnamon-3.0.7.tar.gz 3065791 SHA256 0aa0ce174a4638f54ddb2f0dc1f93a847678fa
 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
 DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942
+DIST cinnamon-3.4.2.tar.gz 2213346 SHA256 182ed619f92831b83e9bfd89803bbd750c6cb0ee9d097120cdd40eb19d41e302 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 WHIRLPOOL 27a508e693d32c1c297df545028ca3737a15e91de197f52fbb41854b3b1f7aa813e20d6062fb1ece432166004651c4cf17d38551a1e79bc2ea1c1f652d96b76f

diff --git a/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
new file mode 100644
index 00000000000..f6e7e06c70f
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.4.2.ebuild
@@ -0,0 +1,234 @@
+# 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://developer.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
+	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 "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-02-11 18:31 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2017-02-11 18:31 UTC (permalink / raw
  To: gentoo-commits

commit:     49835e2a8c1d405d35772302c123159b8dd9f781
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 18:11:56 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 18:30:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49835e2a

gnome-extra/cinnamon: x86 stable, bug 606818

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"

 gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
index 505d5a3409..265cdd7125 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	|| ( $(python_gen_useflags 'python3*') )
 "
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-01-15 19:22 David Seifert
  0 siblings, 0 replies; 95+ messages in thread
From: David Seifert @ 2017-01-15 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     823d962c13fbde7a84baa90f312704022f134401
Author:     Thomas Kemmer <thomas <AT> binaryden <DOT> de>
AuthorDate: Mon Jan  9 18:36:42 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 19:22:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823d962c

gnome-extra/cinnamon: fix missing rdep USE flag in 3.2.x

Gentoo-Bug: 602480

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3203

 gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild | 4 ++--
 gnome-extra/cinnamon/cinnamon-3.2.6.ebuild    | 4 ++--
 gnome-extra/cinnamon/cinnamon-3.2.7.ebuild    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
index 7b78b05..4856e64 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -95,7 +95,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils
 	x11-libs/xapps
 
-	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/gconf-python:2[python_targets_python2_7]
 	dev-python/lxml[python_targets_python2_7]
 	dev-python/pexpect[python_targets_python2_7]

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.6.ebuild
index ffffe3b..1f87bdf 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -95,7 +95,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils
 	x11-libs/xapps
 
-	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/gconf-python:2[python_targets_python2_7]
 	dev-python/lxml[python_targets_python2_7]
 	dev-python/pexpect[python_targets_python2_7]

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild
index 7601c0f..1f87bdf 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils
 	x11-libs/xapps
 
-	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/gconf-python:2[python_targets_python2_7]
 	dev-python/lxml[python_targets_python2_7]
 	dev-python/pexpect[python_targets_python2_7]


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-01-15 19:22 David Seifert
  0 siblings, 0 replies; 95+ messages in thread
From: David Seifert @ 2017-01-15 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     f3db51e98e81d3783f773428b6b0d2b772e8bd26
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 19:21:49 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 19:22:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3db51e9

gnome-extra/cinnamon: use $(python_gen_cond_dep) for generating python deps

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...namon-2.8.8.ebuild => cinnamon-2.8.8-r1.ebuild} |  20 +-
 ...namon-3.0.6.ebuild => cinnamon-3.0.6-r1.ebuild} |  20 +-
 gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild      |  26 +--
 ...on-3.2.0-r1.ebuild => cinnamon-3.0.7-r2.ebuild} |  20 +-
 gnome-extra/cinnamon/cinnamon-3.0.7.ebuild         | 239 ---------------------
 ...on-3.2.0-r1.ebuild => cinnamon-3.2.0-r2.ebuild} |  16 +-
 ...namon-3.2.7.ebuild => cinnamon-3.2.6-r1.ebuild} |  16 +-
 ...namon-3.2.6.ebuild => cinnamon-3.2.7-r1.ebuild} |  16 +-
 8 files changed, 67 insertions(+), 306 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
similarity index 91%
rename from gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
rename to gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
index e7bfb33..cbd2338 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -95,15 +95,15 @@ RDEPEND="${COMMON_DEPEND}
 
 	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]
+	$(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
@@ -123,7 +123,7 @@ RDEPEND="${COMMON_DEPEND}
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
 	dev-util/gtk-doc
 	>=dev-util/intltool-0.4
 	>=sys-devel/gettext-0.17

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild
similarity index 91%
rename from gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
rename to gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild
index 4a10134..eae0699 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -94,15 +94,15 @@ RDEPEND="${COMMON_DEPEND}
 
 	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]
+	$(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
@@ -122,7 +122,7 @@ RDEPEND="${COMMON_DEPEND}
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
 	dev-util/gtk-doc
 	>=dev-util/intltool-0.4
 	>=sys-devel/gettext-0.17

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
index 3db4797..2790548 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	|| ( $(python_gen_useflags 'python3*') )
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2
@@ -94,17 +94,17 @@ RDEPEND="${COMMON_DEPEND}
 
 	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
+	$(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
@@ -122,7 +122,7 @@ RDEPEND="${COMMON_DEPEND}
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
 	dev-util/gtk-doc
 	>=dev-util/intltool-0.4
 	>=sys-devel/gettext-0.17

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
similarity index 91%
copy from gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
copy to gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
index 4856e64..b2395e0 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
@@ -93,17 +93,16 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.3
 
 	x11-misc/xdg-utils
-	x11-libs/xapps
 
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	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]
+	$(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
@@ -123,7 +122,7 @@ RDEPEND="${COMMON_DEPEND}
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
 	dev-util/gtk-doc
 	>=dev-util/intltool-0.4
 	>=sys-devel/gettext-0.17
@@ -191,6 +190,7 @@ src_configure() {
 
 	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" \

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
deleted file mode 100644
index bf51803..00000000
--- a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# 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_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/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 "<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.2.0-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild
similarity index 92%
rename from gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
rename to gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild
index 4856e64..a9a5133 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild
@@ -96,14 +96,14 @@ RDEPEND="${COMMON_DEPEND}
 	x11-libs/xapps
 
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	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]
+	$(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
@@ -123,7 +123,7 @@ RDEPEND="${COMMON_DEPEND}
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
 	dev-util/gtk-doc
 	>=dev-util/intltool-0.4
 	>=sys-devel/gettext-0.17

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
similarity index 92%
rename from gnome-extra/cinnamon/cinnamon-3.2.7.ebuild
rename to gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
index 1f87bdf..6e46b84 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
@@ -96,14 +96,14 @@ RDEPEND="${COMMON_DEPEND}
 	x11-libs/xapps
 
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	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]
+	$(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
@@ -123,7 +123,7 @@ RDEPEND="${COMMON_DEPEND}
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
 	dev-util/gtk-doc
 	>=dev-util/intltool-0.4
 	>=sys-devel/gettext-0.17

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild
similarity index 92%
rename from gnome-extra/cinnamon/cinnamon-3.2.6.ebuild
rename to gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild
index 1f87bdf..6e46b84 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild
@@ -96,14 +96,14 @@ RDEPEND="${COMMON_DEPEND}
 	x11-libs/xapps
 
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	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]
+	$(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
@@ -123,7 +123,7 @@ RDEPEND="${COMMON_DEPEND}
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
 	dev-util/gtk-doc
 	>=dev-util/intltool-0.4
 	>=sys-devel/gettext-0.17


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2017-01-05 21:22 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2017-01-05 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     63abf88cb48bfe011770d552dd994401bc24ba78
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 21:19:51 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 21:22:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63abf88c

gnome-extra/cinnamon: New upstream version 3.2.7

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-3.2.7.ebuild | 239 +++++++++++++++++++++++++++++
 2 files changed, 240 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index faa46da..0bcbd88 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,3 +3,4 @@ DIST cinnamon-3.0.6.tar.gz 3065823 SHA256 1a3aafe4339948e44b2866b25ac6ecc70b021e
 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
+DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild
new file mode 100644
index 00000000..7601c0f
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.2.7.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2017 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_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://developer.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
+	x11-libs/xapps
+
+	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
+	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-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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-12-20 18:23 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2016-12-20 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     246a3441baca8d4dd824026167b7137b5c688501
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:22:15 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:22:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246a3441

gnome-extra/cinnamon: New upstream version 3.2.6

Gentoo-Bug: 603198

+ Homepage redirect target
Gentoo-Bug: 603232

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-3.2.6.ebuild | 239 +++++++++++++++++++++++++++++
 2 files changed, 240 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 4acf785..faa46da 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,3 +2,4 @@ DIST cinnamon-2.8.8.tar.gz 3026643 SHA256 33f838cb9c1d4213ebb18d5869949757dda97a
 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-3.2.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.6.ebuild
new file mode 100644
index 00000000..ffffe3b
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.2.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_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://developer.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
+	x11-libs/xapps
+
+	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
+	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-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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-11-27 21:33 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2016-11-27 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e2a7229e1e2d33f4db989dabfcfc12c669bf9732
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 21:32:44 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 21:33:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a7229e

gnome-extra/cinnamon: Add runtime dep on x11-libs/xapps

Gentoo-Bug: 600552

Package-Manager: portage-2.3.2

 gnome-extra/cinnamon/{cinnamon-3.2.0.ebuild => cinnamon-3.2.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.0.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
similarity index 99%
rename from gnome-extra/cinnamon/cinnamon-3.2.0.ebuild
rename to gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
index f2804f9..7b78b05 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.0.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.0-r1.ebuild
@@ -93,6 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.3
 
 	x11-misc/xdg-utils
+	x11-libs/xapps
 
 	dev-python/dbus-python[python_targets_python2_7]
 	dev-python/gconf-python:2[python_targets_python2_7]


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-11-22 20:42 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2016-11-22 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     fb425dd62b16c602055a91a6cdae9458fbb7de6d
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 20:41:27 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 20:42:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb425dd6

gnome-extra/cinnamon: New upstream version 3.2.0

Package-Manager: portage-2.3.2

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-3.2.0.ebuild | 238 +++++++++++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 61ad6a9..4acf785 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/gnome-extra/cinnamon/cinnamon-3.2.0.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.0.ebuild
new file mode 100644
index 00000000..f2804f9
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.2.0.ebuild
@@ -0,0 +1,238 @@
+# 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_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/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
+	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-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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-10-29 14:51 Mike Gilbert
  0 siblings, 0 replies; 95+ messages in thread
From: Mike Gilbert @ 2016-10-29 14:51 UTC (permalink / raw
  To: gentoo-commits

commit:     2293f466dab76d01a09ca90d035736110b5acbea
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 14:50:35 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 14:51:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2293f466

gnome-extra/cinnamon: another REQUIRED_USE adjustment

Put python2* inside an || dep for consistency and in case python2.8 is
released by somebody in the future.

Package-Manager: portage-2.3.2

 gnome-extra/cinnamon/cinnamon-2.8.8.ebuild    | 4 ++--
 gnome-extra/cinnamon/cinnamon-3.0.6.ebuild    | 4 ++--
 gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild | 4 ++--
 gnome-extra/cinnamon/cinnamon-3.0.7.ebuild    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
index 6926d9f..f8b4235 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
@@ -23,9 +23,9 @@ SLOT="0"
 # bluetooth support dropped due to bug #511648
 IUSE="+nls +networkmanager" #+bluetooth
 
-# We need *both* python 2.7 and 3.x
+# We need *both* python 2.x and 3.x
 REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python2*') )
 	|| ( $(python_gen_useflags 'python3*') )
 "
 

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
index 436d772..0c5138b 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
@@ -23,9 +23,9 @@ SLOT="0"
 # bluetooth support dropped due to bug #511648
 IUSE="+nls +networkmanager" #+bluetooth
 
-# We need *both* python 2.7 and 3.x
+# We need *both* python 2.x and 3.x
 REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python2*') )
 	|| ( $(python_gen_useflags 'python3*') )
 "
 

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
index 374b93a..f2c466d 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
@@ -23,9 +23,9 @@ SLOT="0"
 # bluetooth support dropped due to bug #511648
 IUSE="+nls +networkmanager" #+bluetooth
 
-# We need *both* python 2.7 and 3.x
+# We need *both* python 2.x and 3.x
 REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python2*') )
 	|| ( $(python_gen_useflags 'python3*') )
 "
 

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
index 0d4b662..4db1ddb 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
@@ -23,9 +23,9 @@ SLOT="0"
 # bluetooth support dropped due to bug #511648
 IUSE="+nls +networkmanager" #+bluetooth
 
-# We need *both* python 2.7 and 3.x
+# We need *both* python 2.x and 3.x
 REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python2*') )
 	|| ( $(python_gen_useflags 'python3*') )
 "
 


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-10-29 14:44 Mike Gilbert
  0 siblings, 0 replies; 95+ messages in thread
From: Mike Gilbert @ 2016-10-29 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c64207652232481f43135183d502f8d76bd5771b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 14:43:59 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 14:44:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6420765

gnome-extra/cinnamon: fixup REQUIRED_USE

Generate python_targets flags using python_gen_useflags. We don't need
PYTHON_REQUIRED_USE since we generate a more strict set of flags anyway.

Package-Manager: portage-2.3.2

 gnome-extra/cinnamon/cinnamon-2.8.8.ebuild    | 6 +++---
 gnome-extra/cinnamon/cinnamon-3.0.6.ebuild    | 6 +++---
 gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild | 6 +++---
 gnome-extra/cinnamon/cinnamon-3.0.7.ebuild    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
index 4a341c8..6926d9f 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 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_4 python_targets_python3_5 )
+REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="amd64 x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
index c7b8dbf..436d772 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 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_4 python_targets_python3_5 )
+REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="~amd64 ~x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
index db72f00..374b93a 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 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_4 python_targets_python3_5 )
+REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="~amd64 ~x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
index dc5672e..0d4b662 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 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_4 python_targets_python3_5 )
+REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
+	|| ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="amd64 x86"


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-10-29 11:35 Michael Palimaka
  0 siblings, 0 replies; 95+ messages in thread
From: Michael Palimaka @ 2016-10-29 11:35 UTC (permalink / raw
  To: gentoo-commits

commit:     ec4df4076fdd473a8d2c68d923f835c29d86b7a2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 11:35:15 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 11:35:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4df407

gnome-extra/cinnamon: remove invalid USE flag from REQUIRED_USE

Gentoo-bug: 598342

Package-Manager: portage-2.3.2

 gnome-extra/cinnamon/cinnamon-2.8.8.ebuild    | 2 +-
 gnome-extra/cinnamon/cinnamon-3.0.6.ebuild    | 2 +-
 gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild | 2 +-
 gnome-extra/cinnamon/cinnamon-3.0.7.ebuild    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
index cf91098..4a341c8 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
@@ -26,7 +26,7 @@ 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 )
+	|| ( python_targets_python3_4 python_targets_python3_5 )
 "
 
 KEYWORDS="amd64 x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
index 4a06a2d..c7b8dbf 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
@@ -26,7 +26,7 @@ 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 )
+	|| ( python_targets_python3_4 python_targets_python3_5 )
 "
 
 KEYWORDS="~amd64 ~x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
index 91c76c4..db72f00 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
@@ -26,7 +26,7 @@ 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 )
+	|| ( python_targets_python3_4 python_targets_python3_5 )
 "
 
 KEYWORDS="~amd64 ~x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
index 254e7fa..dc5672e 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
@@ -26,7 +26,7 @@ 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 )
+	|| ( python_targets_python3_4 python_targets_python3_5 )
 "
 
 KEYWORDS="amd64 x86"


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-10-18 19:07 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2016-10-18 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     09c664ed39ff4d25e096f8db8929710a4dd57b12
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 19:06:37 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 19:06:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c664ed

gnome-extra/cinnamon: Fix gtk-engines-adwait theme dependency use flag

Gentoo-Bug: 596556

Package-Manager: portage-2.3.1

 gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild | 239 ++++++++++++++++++++++++++
 1 file changed, 239 insertions(+)

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
new file mode 100644
index 00000000..91c76c4
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.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
+	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 "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-10-01  0:54 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2016-10-01  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     180adbc447bdd8976690ca60638a79e5e9f110eb
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 22:51:02 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 00:53:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180adbc4

gnome-extra/cinnamon: x86 stable, bug 587010

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"

 gnome-extra/cinnamon/cinnamon-3.0.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
index 4c2c20e..254e7fa 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 "
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-09-17 13:32 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2016-09-17 13:32 UTC (permalink / raw
  To: gentoo-commits

commit:     17f1ab4237ef8df190371338745a88d8534fe287
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 12:00:05 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 13:30:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f1ab42

gnome-extra/cinnamon: Version bump

Package-Manager: portage-2.3.0

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-3.0.7.ebuild | 239 +++++++++++++++++++++++++++++
 2 files changed, 240 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index ecb1caf..61ad6a9 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +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

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
new file mode 100644
index 00000000..4a06a2d
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7.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 "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-09-17 13:29 Kristian Fiskerstrand
  0 siblings, 0 replies; 95+ messages in thread
From: Kristian Fiskerstrand @ 2016-09-17 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     24aacc0505ba4f5aa3cf3837f9b4ce242d417696
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 12:53:07 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 13:28:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24aacc05

gnome-extra/cinnamon: Reassigning to new Cinnamon Project

Package-Manager: portage-2.3.0

 gnome-extra/cinnamon/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 59df34f..216784b 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-07-09 11:20 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2016-07-09 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     8197fa0faadd5c23b47b80becfa6e25788b62b78
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 11:18:30 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 11:20:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8197fa0f

gnome-extra/cinnamon: Rebuilding with NM subslot bump will be needed when it's bumped (likely when we are ready to kill the obsolete dbus-glib support from NM)

Package-Manager: portage-2.3.0

 gnome-extra/cinnamon/cinnamon-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
index 0efad74..4a06a2d 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
@@ -61,7 +61,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=x11-wm/muffin-3.0.0[introspection]
 	networkmanager? (
 		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
+		>=net-misc/networkmanager-0.8.999:=[introspection] )
 "
 #bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
 


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-06-25 16:53 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2016-06-25 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4ee2645d4e63a78eea6f1ab20c0ddd03acfdc2f5
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 15:01:35 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> 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 "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-05-29 12:42 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2016-05-29 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9d6ac8c221234d9b52ded99b3e532ec2fa512a5e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 11:33:46 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 29 12:40:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6ac8c2

gnome-extra/cinnamon: Drop old

Package-Manager: portage-2.3.0_rc1

 gnome-extra/cinnamon/Manifest               |   2 -
 gnome-extra/cinnamon/cinnamon-2.6.13.ebuild | 262 ----------------------------
 gnome-extra/cinnamon/cinnamon-2.8.4.ebuild  | 247 --------------------------
 3 files changed, 511 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 27933bd..0bece92 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,4 +1,2 @@
-DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
-DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566
 DIST cinnamon-2.8.6.tar.gz 3025161 SHA256 c262ae64320d4db8bffdfa7f05ab5a82449e96035b35dd8fb9353741323cb9a2 SHA512 fb683aaea1704eec5a1d2221d55c5e0e6530897f7aefc6ff9b9ff9d15818737a0d5d15aaa1d1f830e1f01e462324db026ac8c4475e39630cd6fd4a67dca9bddf WHIRLPOOL 488c215daf441be87d8f552bd4f0d8e55683286db143b2fbe5f8dd43a53df8e5c1e03b9230708ca149b85e3d9a93df58618b50afa014755a5ea943e33123edb8
 DIST cinnamon-2.8.8.tar.gz 3026643 SHA256 33f838cb9c1d4213ebb18d5869949757dda97a6e0745f224d06be75de69caee7 SHA512 e41fae744ea2dfcb3589a47f689b230369a8dc4c3682f3cc15836a9be6c67fd1cd872223084b518cd422057431ea77f7df67055757b5cd43e5e96cb3cb3a2ec5 WHIRLPOOL 1cb5e0b13814d4b21e7711ad0d5754aa85c36e4616d48e7dbebad1bd7d34b928a5b4d4d55b6fd12fb2b44c96b22535ca68b3b6542af99306a609cbc58ea59784

diff --git a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
deleted file mode 100644
index 8cbf5cf..0000000
--- a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python_targets_python2_7
-	|| ( python_targets_python3_3 python_targets_python3_4 )
-	"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.5[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[python_targets_python2_7]
-	dev-python/gconf-python:2[python_targets_python2_7]
-	dev-python/lxml[python_targets_python2_7]
-	dev-python/pexpect[python_targets_python2_7]
-	dev-python/pycairo[python_targets_python2_7]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[python_targets_python2_7]
-	dev-python/pypam[python_targets_python2_7]
-	dev-python/pillow[python_targets_python2_7]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
-
-	# Fix build with clutter[-gtk]
-	# https://github.com/linuxmint/Cinnamon/pull/4600
-	epatch "${FILESDIR}"/${PN}-2.6.13-test-recorder-includes.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
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
-		-i files/usr/lib/*/*.py \
-		-i files/usr/lib/*/*/*.py \
-		-i files/usr/bin/* || die "sed failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	epatch_user
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<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-2.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
deleted file mode 100644
index 12c8a03..0000000
--- a/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python_targets_python2_7
-	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.5[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[python_targets_python2_7]
-	dev-python/gconf-python:2[python_targets_python2_7]
-	dev-python/lxml[python_targets_python2_7]
-	dev-python/pexpect[python_targets_python2_7]
-	dev-python/pycairo[python_targets_python2_7]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[python_targets_python2_7]
-	dev-python/pypam[python_targets_python2_7]
-	dev-python/pillow[python_targets_python2_7]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	epatch_user
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<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
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2016-03-06 18:58 Mikle Kolyada
  0 siblings, 0 replies; 95+ messages in thread
From: Mikle Kolyada @ 2016-03-06 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6ab6c3416b071ecb1fc853c9dc3eaf2a6bab33a0
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 18:28:51 2016 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 18:55:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab6c341

gnome-extra/cinnamon: x86 stable wrt bug #566378

Package-Manager: portage-2.2.26

 gnome-extra/cinnamon/cinnamon-2.8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
index 5452e34..6601403 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 "
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2015-12-26 15:28 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2015-12-26 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     0243efe68f2add43971c90c9497dd2d04ae9cc8b
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 14:27:24 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 15:28:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0243efe6

gnome-extra/cinnamon: Version bump, cjs-2.8 needed (#566900 by Marc Andi)

Package-Manager: portage-2.2.26

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-2.8.6.ebuild | 247 +++++++++++++++++++++++++++++
 2 files changed, 248 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 10a13b8..25f364a 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
 DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566
+DIST cinnamon-2.8.6.tar.gz 3025161 SHA256 c262ae64320d4db8bffdfa7f05ab5a82449e96035b35dd8fb9353741323cb9a2 SHA512 fb683aaea1704eec5a1d2221d55c5e0e6530897f7aefc6ff9b9ff9d15818737a0d5d15aaa1d1f830e1f01e462324db026ac8c4475e39630cd6fd4a67dca9bddf WHIRLPOOL 488c215daf441be87d8f552bd4f0d8e55683286db143b2fbe5f8dd43a53df8e5c1e03b9230708ca149b85e3d9a93df58618b50afa014755a5ea943e33123edb8

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
new file mode 100644
index 0000000..62a193c
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	python_targets_python2_7
+	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.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]
+	${PYTHON_DEPS}
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/gconf-python:2[python_targets_python2_7]
+	dev-python/lxml[python_targets_python2_7]
+	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pycairo[python_targets_python2_7]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinotify[python_targets_python2_7]
+	dev-python/pypam[python_targets_python2_7]
+	dev-python/pillow[python_targets_python2_7]
+
+	x11-themes/gnome-themes-standard[gtk]
+	x11-themes/gnome-icon-theme-symbolic
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/polib[python_targets_python2_7]
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Fix GNOME 3.14 support (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3577
+	epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	epatch_user
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-rpath \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2015-11-17 20:23 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2015-11-17 20:23 UTC (permalink / raw
  To: gentoo-commits

commit:     a69c0fd7de78e5d5bde40837adb3732cb9b456de
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 19:04:01 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 19:04:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69c0fd7

gnome-extra/cinnamon: Version bump

Package-Manager: portage-2.2.24

 gnome-extra/cinnamon/Manifest              |   1 +
 gnome-extra/cinnamon/cinnamon-2.8.4.ebuild | 247 +++++++++++++++++++++++++++++
 2 files changed, 248 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index d522a0b..aa9f159 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
 DIST cinnamon-2.8.3.tar.gz 3024863 SHA256 e83e3f9fcf00214ec8444dfe4be88e9d00bec14f03b3cbf01dd6dfa7237dec9b SHA512 28a3c43f268066665999d7a9c0e512e45b3f8be9ef2213ca092b5bb3ce1a8f4a595dc2b8d4d5c6486647ce37577b7c607d7f06af17fc4bccbf6ff0a807a85b32 WHIRLPOOL d37c1c319e547e8a5d1a06a6478b5a76d4c21b05a7b4e4eb280dfb29515f6a73ee01725477a1d9a03308a86033d98cdf0572674a2399d4334e4b204c00ee5c06
+DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
new file mode 100644
index 0000000..12c8a03
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	python_targets_python2_7
+	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.4
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-sound/pulseaudio:0=[glib]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-2.5[introspection]
+	${PYTHON_DEPS}
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/gconf-python:2[python_targets_python2_7]
+	dev-python/lxml[python_targets_python2_7]
+	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pycairo[python_targets_python2_7]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinotify[python_targets_python2_7]
+	dev-python/pypam[python_targets_python2_7]
+	dev-python/pillow[python_targets_python2_7]
+
+	x11-themes/gnome-themes-standard[gtk]
+	x11-themes/gnome-icon-theme-symbolic
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/polib[python_targets_python2_7]
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+	# Fix GNOME 3.14 support (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3577
+	epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	epatch_user
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-rpath \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2015-11-17 20:23 Pacho Ramos
  0 siblings, 0 replies; 95+ messages in thread
From: Pacho Ramos @ 2015-11-17 20:23 UTC (permalink / raw
  To: gentoo-commits

commit:     407edaa7706509213f94414dffe35bfc7c38164e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 19:04:20 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 19:04:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=407edaa7

gnome-extra/cinnamon: Drop old

Package-Manager: portage-2.2.24

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-2.8.3.ebuild | 247 -----------------------------
 2 files changed, 248 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index aa9f159..10a13b8 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
 DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
-DIST cinnamon-2.8.3.tar.gz 3024863 SHA256 e83e3f9fcf00214ec8444dfe4be88e9d00bec14f03b3cbf01dd6dfa7237dec9b SHA512 28a3c43f268066665999d7a9c0e512e45b3f8be9ef2213ca092b5bb3ce1a8f4a595dc2b8d4d5c6486647ce37577b7c607d7f06af17fc4bccbf6ff0a807a85b32 WHIRLPOOL d37c1c319e547e8a5d1a06a6478b5a76d4c21b05a7b4e4eb280dfb29515f6a73ee01725477a1d9a03308a86033d98cdf0572674a2399d4334e4b204c00ee5c06
 DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.3.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.3.ebuild
deleted file mode 100644
index 12c8a03..0000000
--- a/gnome-extra/cinnamon/cinnamon-2.8.3.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python_targets_python2_7
-	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.5[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[python_targets_python2_7]
-	dev-python/gconf-python:2[python_targets_python2_7]
-	dev-python/lxml[python_targets_python2_7]
-	dev-python/pexpect[python_targets_python2_7]
-	dev-python/pycairo[python_targets_python2_7]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[python_targets_python2_7]
-	dev-python/pypam[python_targets_python2_7]
-	dev-python/pillow[python_targets_python2_7]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	epatch_user
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<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
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2015-09-07 21:11 Mikle Kolyada
  0 siblings, 0 replies; 95+ messages in thread
From: Mikle Kolyada @ 2015-09-07 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     93da49dc73d6f1ba47c89cde60d9a02d99e363d4
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 20:25:23 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 21:07:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93da49dc

gnome-extra/cinnamon: amd64 stable wrt bug #551826

Package-Manager: portage-2.2.20.1

 gnome-extra/cinnamon/cinnamon-2.6.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
index 5f1d536..afdebd1 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( python_targets_python3_3 python_targets_python3_4 )
 	"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-atk:2


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2015-09-03  2:13 Alexandre Rostovtsev
  0 siblings, 0 replies; 95+ messages in thread
From: Alexandre Rostovtsev @ 2015-09-03  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     bd9dcf1438fd0a7df4ee76fa5b3bec401ab906b3
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 02:03:33 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 02:03:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9dcf14

gnome-extra/cinnamon: add 2.6.13

Gentoo-Bug: 554122
Reported-by: Akiraba Honata
Package-Manager: portage-2.2.20.1

 gnome-extra/cinnamon/Manifest               |   1 +
 gnome-extra/cinnamon/cinnamon-2.6.13.ebuild | 258 ++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index c98b1f5..9d4cb39 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
 DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d
+DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
 DIST cinnamon-2.6.9.tar.gz 2968234 SHA256 9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756 SHA512 372492f9a9833ae3b7ba2b22d6c4cec8bb8c0a02282d1efe595e8a822a7064d7129b2a56f9df7dd4ec8f329bee3db22ffb41672752f5daa6811973d42cae150d WHIRLPOOL 83e04e781ac175f4ce885c84554d70d8322a613fac30735af3efb57e43afb8ffb757771cc153b4b1ae8070a219972d76f707ce2fe40b7714aee6854e9a0bdd0d

diff --git a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
new file mode 100644
index 0000000..76f706b
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	python_targets_python2_7
+	|| ( python_targets_python3_3 python_targets_python3_4 )
+	"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.29.10:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.4
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-sound/pulseaudio:0=[glib]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-2.5[introspection]
+	${PYTHON_DEPS}
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/gconf-python:2[python_targets_python2_7]
+	dev-python/lxml[python_targets_python2_7]
+	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pycairo[python_targets_python2_7]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinotify[python_targets_python2_7]
+	dev-python/pypam[python_targets_python2_7]
+	virtual/python-imaging[python_targets_python2_7]
+
+	x11-themes/gnome-themes-standard[gtk]
+	x11-themes/gnome-icon-theme-symbolic
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	gnome-extra/polkit-gnome
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/polib[python_targets_python2_7]
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
+
+	# Fix GNOME 3.14 support (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3577
+	epatch "${FILESDIR}"/${PN}-2.4.5-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
+
+	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
+	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
+		-i files/usr/lib/*/*.py \
+		-i files/usr/lib/*/*/*.py \
+		-i files/usr/bin/* || die "sed failed"
+	if [[ "$(get_libdir)" != lib ]]; then
+		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+	fi
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	epatch_user
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-rpath \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<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
+}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2015-09-03  1:55 Alexandre Rostovtsev
  0 siblings, 0 replies; 95+ messages in thread
From: Alexandre Rostovtsev @ 2015-09-03  1:55 UTC (permalink / raw
  To: gentoo-commits

commit:     dbfaf9be24834767acdc0dc4f0aff89ee00e540d
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 01:53:25 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 01:54:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbfaf9be

gnome-extra/cinnamon: raise muffin dep to 2.5

Gentoo-Bug: 554744
Reported-by: Laurent Vivier
Upstream-Bug-url: https://github.com/linuxmint/Cinnamon/pull/4582
Package-Manager: portage-2.2.20.1

 gnome-extra/cinnamon/cinnamon-2.6.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
index 19ddd13..76f706b 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	>=x11-libs/startup-notification-0.11
 	x11-libs/libX11
 	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.4[introspection]
+	>=x11-wm/muffin-2.5[introspection]
 	${PYTHON_DEPS}
 	networkmanager? (
 		gnome-base/libgnome-keyring


^ permalink raw reply related	[flat|nested] 95+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
@ 2015-09-03  1:55 Alexandre Rostovtsev
  0 siblings, 0 replies; 95+ messages in thread
From: Alexandre Rostovtsev @ 2015-09-03  1:55 UTC (permalink / raw
  To: gentoo-commits

commit:     abf170ab5db5f5c6371940de5986b026190be981
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 01:31:08 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 01:53:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf170ab

gnome-extra/cinnamon: remove old

Package-Manager: portage-2.2.20.1

 gnome-extra/cinnamon/Manifest              |   1 -
 gnome-extra/cinnamon/cinnamon-2.6.8.ebuild | 256 -----------------------------
 2 files changed, 257 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 644c5d4..c98b1f5 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
 DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d
-DIST cinnamon-2.6.8.tar.gz 2967957 SHA256 fe2e0e0a128711875a24c3511eff78e48ecd131db8f758781950784270af15a6 SHA512 687048660dbc7797dfa3fb6aeb6f58c334d1ae4c384d600031e74db661ce5edc8109dec5dfc7b643e0d52211e41723e22da725f7866a99949f0b3e07e0716c9e WHIRLPOOL 2dd103e0db3e80fddc94850936942d6ef13d3603f1fde4ad69fb554bb79f39bd7dbcb08bfd5c2f156f9da2802a43ee2c7c6169b0a68b6e8e269ed7774bb203dc
 DIST cinnamon-2.6.9.tar.gz 2968234 SHA256 9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756 SHA512 372492f9a9833ae3b7ba2b22d6c4cec8bb8c0a02282d1efe595e8a822a7064d7129b2a56f9df7dd4ec8f329bee3db22ffb41672752f5daa6811973d42cae150d WHIRLPOOL 83e04e781ac175f4ce885c84554d70d8322a613fac30735af3efb57e43afb8ffb757771cc153b4b1ae8070a219972d76f707ce2fe40b7714aee6854e9a0bdd0d

diff --git a/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
deleted file mode 100644
index 5ac7b6b..0000000
--- a/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-# We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python_targets_python2_7
-	|| ( python_targets_python3_3 python_targets_python3_4 )
-	"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.4[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[python_targets_python2_7]
-	dev-python/gconf-python:2[python_targets_python2_7]
-	dev-python/lxml[python_targets_python2_7]
-	dev-python/pexpect[python_targets_python2_7]
-	dev-python/pycairo[python_targets_python2_7]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[python_targets_python2_7]
-	dev-python/pypam[python_targets_python2_7]
-	virtual/python-imaging[python_targets_python2_7]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.4.5-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
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
-		-i files/usr/lib/*/*.py \
-		-i files/usr/lib/*/*/*.py \
-		-i files/usr/bin/* || die "sed failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	epatch_user
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<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
-}


^ permalink raw reply related	[flat|nested] 95+ messages in thread

end of thread, other threads:[~2024-09-27  5:57 UTC | newest]

Thread overview: 95+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-27 22:20 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/ Kristian Fiskerstrand
  -- strict thread matches above, loose matches on Subject: below --
2024-09-27  5:57 Eli Schwartz
2024-09-25 14:22 Joonas Niilola
2024-09-25 13:58 Joonas Niilola
2024-08-23  5:23 Eli Schwartz
2024-08-23  5:23 Eli Schwartz
2024-08-23  5:23 Eli Schwartz
2024-08-23  5:23 Eli Schwartz
2024-06-19  5:24 Arthur Zamarin
2024-06-02 21:16 Sam James
2024-02-15 13:29 Joonas Niilola
2024-02-15 13:29 Joonas Niilola
2023-10-13  7:43 Joonas Niilola
2023-10-04  8:24 Joonas Niilola
2023-09-26 15:59 WANG Xuerui
2023-06-10 23:05 Andreas Sturmlechner
2023-06-05  9:58 Joonas Niilola
2023-06-05  9:58 Joonas Niilola
2023-05-07 22:14 Sam James
2023-05-01  1:43 Sam James
2023-05-01  1:43 Sam James
2022-12-24  7:11 Sam James
2022-11-22  6:20 Sam James
2022-11-22  6:20 Sam James
2022-10-12 23:09 Sam James
2022-10-12 23:09 Sam James
2022-09-07  7:52 Michał Górny
2022-05-13 20:07 Jakov Smolić
2022-05-13  4:28 Yixun Lan
2022-05-11  2:11 Sam James
2022-05-05  3:01 Sam James
2022-05-05  3:01 Sam James
2022-05-02  1:11 Sam James
2022-02-27 23:50 Sam James
2022-02-18  2:44 Sam James
2021-12-24 20:00 Jakov Smolić
2021-12-24 19:25 Jakov Smolić
2021-11-23  1:25 Yixun Lan
2021-10-20  1:14 Sam James
2021-10-20  1:14 Sam James
2021-07-31  8:36 Joonas Niilola
2021-07-31  8:36 Joonas Niilola
2021-07-15 11:32 Joonas Niilola
2021-06-12  3:55 Sam James
2021-06-08  7:34 Sam James
2021-06-01 16:28 Joonas Niilola
2021-06-01 16:28 Joonas Niilola
2021-01-06  1:05 Sam James
2020-12-29 17:14 Sam James
2020-12-27  5:06 Sam James
2020-12-16 22:30 Sam James
2020-09-15 14:20 Joonas Niilola
2020-09-09  2:15 Sam James
2020-05-29  0:11 Matt Turner
2019-08-18 12:37 David Seifert
2019-06-07 20:12 Mikle Kolyada
2019-06-04 20:58 Thomas Deutschmann
2019-04-24 16:28 Pacho Ramos
2018-12-08 22:11 Mikle Kolyada
2018-11-28 19:56 Kristian Fiskerstrand
2018-06-23 10:14 Pacho Ramos
2018-04-12 19:07 Thomas Deutschmann
2018-04-06 14:00 Aaron Bauman
2017-11-27 22:20 Kristian Fiskerstrand
2017-11-26 15:43 Kristian Fiskerstrand
2017-09-05 19:45 Kristian Fiskerstrand
2017-07-28 14:27 Kristian Fiskerstrand
2017-06-24 19:56 Kristian Fiskerstrand
2017-06-24 19:41 Kristian Fiskerstrand
2017-06-24 14:58 Kristian Fiskerstrand
2017-02-11 18:31 Pacho Ramos
2017-01-15 19:22 David Seifert
2017-01-15 19:22 David Seifert
2017-01-05 21:22 Kristian Fiskerstrand
2016-12-20 18:23 Kristian Fiskerstrand
2016-11-27 21:33 Kristian Fiskerstrand
2016-11-22 20:42 Kristian Fiskerstrand
2016-10-29 14:51 Mike Gilbert
2016-10-29 14:44 Mike Gilbert
2016-10-29 11:35 Michael Palimaka
2016-10-18 19:07 Kristian Fiskerstrand
2016-10-01  0:54 Pacho Ramos
2016-09-17 13:32 Pacho Ramos
2016-09-17 13:29 Kristian Fiskerstrand
2016-07-09 11:20 Pacho Ramos
2016-06-25 16:53 Pacho Ramos
2016-05-29 12:42 Pacho Ramos
2016-03-06 18:58 Mikle Kolyada
2015-12-26 15:28 Pacho Ramos
2015-11-17 20:23 Pacho Ramos
2015-11-17 20:23 Pacho Ramos
2015-09-07 21:11 Mikle Kolyada
2015-09-03  2:13 Alexandre Rostovtsev
2015-09-03  1:55 Alexandre Rostovtsev
2015-09-03  1:55 Alexandre Rostovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox