From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1292648-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13C3F1382C5 for <garchives@archives.gentoo.org>; Sat, 12 Jun 2021 03:55:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F08DEE08FC; Sat, 12 Jun 2021 03:55:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89AD9E08FC for <gentoo-commits@lists.gentoo.org>; Sat, 12 Jun 2021 03:55:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EDD934087C for <gentoo-commits@lists.gentoo.org>; Sat, 12 Jun 2021 03:55:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E47F87B9 for <gentoo-commits@lists.gentoo.org>; Sat, 12 Jun 2021 03:55:34 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1623470120.035b8c7ddbe2114cc92a56c21876339f8043ef04.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon/Manifest gnome-extra/cinnamon/cinnamon-4.6.7.ebuild X-VCS-Directories: gnome-extra/cinnamon/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 035b8c7ddbe2114cc92a56c21876339f8043ef04 X-VCS-Branch: master Date: Sat, 12 Jun 2021 03:55:34 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: edcf7d6c-6ff4-4e34-a4f3-f7adde585c14 X-Archives-Hash: df29e3a97eb1afee36827bd0c00da9b5 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 -}