From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- gnome-extra/cinnamon-session/Manifest | 7 --- .../cinnamon-session-3.6.1-r5.ebuild | 70 ---------------------- .../cinnamon-session-3.8.0-r1.ebuild | 69 --------------------- .../files/cinnamon-session-3.0.1-automagic.patch | 38 ------------ .../files/cinnamon-session-3.6.1-elogind.patch | 65 -------------------- .../files/cinnamon-session-3.6.1-elogind2.patch | 21 ------- 6 files changed, 270 deletions(-) delete mode 100644 gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild delete mode 100644 gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild delete mode 100644 gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch delete mode 100644 gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch delete mode 100644 gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch (limited to 'gnome-extra/cinnamon-session') diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest index ff0daf85321c..deab8eae1791 100644 --- a/gnome-extra/cinnamon-session/Manifest +++ b/gnome-extra/cinnamon-session/Manifest @@ -1,12 +1,5 @@ -AUX cinnamon-session-3.0.1-automagic.patch 1470 BLAKE2B 799b731979f9a5326d61ec130db092a6b52d10eb0f434302b49fa0996fc9b6c3073ff312bd5f84faf1b12936919209db6159a7ad235f765af78b622b06b700db SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971 -AUX cinnamon-session-3.6.1-elogind.patch 1948 BLAKE2B 616dde6cb6612126074524df8662fc30cf59c126a37cfa9d82b09c086d31f47af64d9f96210a8d430b9eb3aca7279b93ce38f31e4574274064d103dc2f142b97 SHA512 ad8c067514318c126aab6d72da7004a0c07964cb9cac8c3763ec39b07d222a9dd6425eb464f1f0047d55c61f8a335611bd46e1546e2f170b43959207ff98c75f -AUX cinnamon-session-3.6.1-elogind2.patch 743 BLAKE2B 4827c2cc5c8bcb74b0a31dc81c4fd4a25ade00f3a22371627cc3bdb5e3fb4476f7b66954ab6101681bef04bd7e38531851f2e371e6dee32c6294fc6f6faa240c SHA512 03e7beeaf6a93aaedcbe070c6182d3fcc898bd8410a65c63a9c5dcce310e97a4a4654e88e91e7aa7d8c12eef12d8f02eba89d8e007842c27d04dc9165c642de3 AUX cinnamon-session-3.8.0-elogind.patch 712 BLAKE2B dd1ce68b30e849a62dd563c3bd640639974763f4aae108ff379adf942289fdbda46367a13a9a640e11750ca978a0f28dc3c6cb17f309c7e7a44bc3b7c8769ea6 SHA512 b0f04b560cf76fa040ce838cd21e811b0e627187e7500e5bf7717f5b1ba242db0485feb986ba0e89e5daa044f0268047c9ff37b9a72c41cbda16975929db7178 AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e16b2284e0fdd7a89963e1e9275cf635caade162022573e029f3d745bd1511f9a11920304da0a84b54b0bcca211327330d6f244 SHA512 756dc8c0f57187d20c491a27fa130ee56c01c156d8c0881f2a0bac7173dd7f039aea38475fdfba52b8c467ea2258cc0af7ebc7ba2053817df5c9e5f50bcc32f2 -DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137 -DIST cinnamon-session-3.8.0.tar.gz 197983 BLAKE2B e0a8b57637668586f941c64df6e610a5df385a6ea67a71e1e666344a73e0095861beb9d958344dfd18988960df1e4380e72257c5f490ab344a4e0de6a749c2d1 SHA512 c737ee77396d38e27d93a5d2cec76d9072038f6a096c6071f450a9a3eb71d83beb1da3ff3320820d7989731281e5a108c330eec333a7fcb66ca7a37f16501c76 DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B 713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39 SHA512 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e -EBUILD cinnamon-session-3.6.1-r5.ebuild 1613 BLAKE2B e52ae9b2f5f3b9c9a959db4037ebbd75bd5fd34c8c07a17b1788dc730e6de82a208d0797b284d712f590922ef36bf83be1a8133644052e506946c731a6a307ab SHA512 06681ec6c2a1cdaabc243880315bafe8a4d332043dc031178145a1596099b0b38fafd6f5e6674c3276bc78b13069ef7c4832adb705a31d12997a6a062ba9c0c9 -EBUILD cinnamon-session-3.8.0-r1.ebuild 1547 BLAKE2B c28815ce1abdcede81fe8f479be15d25cf71baaf9324c09b16b8526176ab6a71c5ee2c636cf619f8c3cfebab7e88f29c79d53152ce2b50efe5f5bb12d49c8492 SHA512 2a83ea20d01142682077cad35f8cd15466ae617b26a0199f82957eace1f3774a1ac3c487ec4815e22b8ba8bcc59e23b3f99c85cbd2f23d6a545fa9abac6f4580 EBUILD cinnamon-session-4.0.0-r1.ebuild 1545 BLAKE2B 5f2cef2b7bca1f92fe94d66888d796eee226d89eb2b4510262623752be585e3b63fe0b31cca821585606938e7ff47c0b10168b428a7cd4d346e1965051b25bd2 SHA512 72d9629efdef77c31e563b49873651742cf8b2b53c8773c9baae595607b73ffc571354780151bfe676da54f230a56c4fbd910a86824eaec8aef4c4f7e96d8972 MISC metadata.xml 451 BLAKE2B ef4fb2792b489e2c45e320fd073b71a3ae1095cd18868fb244fe21bd271dabc683b9a0db617338c15ec35e16124f2d851346da60647676053e80e7e21857dc81 SHA512 a96919c80e1cd5ea2536a928572aeb5315c1df6f3414d901f18410a0e2a4cbac8218a4a52a90159df94b35e8946066952fa625ff44ce55670bed9c140d374c15 diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild deleted file mode 100644 index 9dc721e9e17d..000000000000 --- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils gnome2 - -DESCRIPTION="Cinnamon session manager" -HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html" -SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc elogind ipv6 systemd" -REQUIRED_USE="^^ ( elogind systemd )" - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.88 - >=dev-libs/glib-2.37.3:2 - media-libs/libcanberra - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3:3 - x11-libs/cairo - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango[X] - virtual/opengl - systemd? ( >=sys-apps/systemd-183 - sys-auth/polkit ) - elogind? ( sys-power/upower - sys-auth/polkit[elogind] ) -" - -RDEPEND="${COMMON_DEPEND} - >=gnome-extra/cinnamon-desktop-2.6[systemd=] - elogind? ( sys-auth/elogind[policykit] ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.40.6 - virtual/pkgconfig - doc? ( app-text/xmlto ) - - gnome-base/gnome-common -" - -src_prepare() { - # make upower and logind check non-automagic - eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" - eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch" - eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch" - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-gconf \ - --disable-static \ - --enable-logind \ - $(use_enable doc docbook-docs) \ - $(use_enable ipv6) -} diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild deleted file mode 100644 index 54fe4a32199d..000000000000 --- a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit meson eutils gnome2 - -DESCRIPTION="Cinnamon session manager" -HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html" -SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc elogind ipv6 systemd" -REQUIRED_USE="^^ ( elogind systemd )" - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.88 - >=dev-libs/glib-2.37.3:2 - media-libs/libcanberra - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3:3 - x11-libs/cairo - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango[X] - >=x11-libs/xapps-1.0.4 - virtual/opengl - systemd? ( >=sys-apps/systemd-183 - sys-auth/polkit ) - elogind? ( sys-power/upower - sys-auth/polkit[elogind] ) -" - -RDEPEND="${COMMON_DEPEND} - >=gnome-extra/cinnamon-desktop-2.6[systemd=] - elogind? ( sys-auth/elogind[policykit] ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.40.6 - virtual/pkgconfig - doc? ( app-text/xmlto ) - - gnome-base/gnome-common -" - -src_prepare() { - eapply "${FILESDIR}/${PN}-3.8.0-elogind.patch" \ - "${FILESDIR}/${PN}-3.8.0-elogind2.patch" - gnome2_src_prepare -} - -src_configure() { - meson_src_configure \ - -Dwith-gconf=false \ - -Dwith-docbook=$(usex doc true false) \ - -Dwith-ipv6=$(usex ipv6 true false) -} - -src_install() { - meson_src_install -} diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch deleted file mode 100644 index 9ca31379a60e..000000000000 --- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/configure.ac~ 2016-05-20 13:03:13.000000000 +0200 -+++ b/configure.ac 2016-06-25 17:36:55.389583194 +0200 -@@ -56,7 +56,15 @@ - - dnl We can only support old upower - dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 --PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) -+AC_ARG_ENABLE([old-upower], -+ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]), -+ [enable_old_upower=$enableval], -+ [enable_old_upower=auto]) -+ -+have_old_upower=no -+if test x$enable_old_upower != xno ; then -+ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) -+fi - AS_IF([test x$have_old_upower = xyes], [ - AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) - ]) -@@ -96,9 +104,15 @@ - dnl Check for logind - dnl ==================================================================== - --PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [ -- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no]) --]) -+AC_ARG_ENABLE([logind], -+ AS_HELP_STRING([--disable-logind], [Do not check for logind]), -+ [enable_logind=$enableval], -+ [enable_logind=auto]) -+ -+have_logind=no -+if test x$enable_logind != xno ; then -+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no]) -+fi - - if test x$have_logind = xyes; then - AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch deleted file mode 100644 index fdbda72ca22e..000000000000 --- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am -index 789d47d..d8093d4 100644 ---- a/cinnamon-session/Makefile.am -+++ b/cinnamon-session/Makefile.am -@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS = \ - $(XEXT_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(LOGIND_CFLAGS) \ -+ $(ELOGIND_CFLAGS) \ - -I$(top_srcdir)/egg \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -DDATA_DIR=\""$(datadir)/cinnamon-session"\" \ -@@ -91,6 +92,7 @@ cinnamon_session_LDADD = \ - $(UPOWER_LIBS) \ - $(GCONF_LIBS) \ - $(LOGIND_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(EXECINFO_LIBS) - - libcsmutil_la_SOURCES = \ -diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c -index cef991c..dc2aa2e 100644 ---- a/cinnamon-session/csm-systemd.c -+++ b/cinnamon-session/csm-systemd.c -@@ -32,7 +32,11 @@ - #include - #include - -+#ifdef HAVE_ELOGIND -+#include -+#else - #include -+#endif - - #include - #include -diff --git a/configure.ac b/configure.ac -index 38db5a3..8dafc6a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind], - - have_logind=no - if test x$enable_logind != xno ; then -- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no]) -+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no]) - fi - - if test x$have_logind = xyes; then - AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) - fi - -+have_elogind=no -+PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no]) -+if test x$have_elogind = xyes; then -+ AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported]) -+fi -+ - AC_SUBST(LOGIND_CFLAGS) - AC_SUBST(LOGIND_LIBS) -+AC_SUBST(ELOGIND_CFLAGS) -+AC_SUBST(ELOGIND_LIBS) - - dnl ==================================================================== - dnl Option to disable DBus user session support. diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch deleted file mode 100644 index a58703bc1bf3..000000000000 --- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index c46b35f..5bde44a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind], - - have_logind=no - if test x$enable_logind != xno ; then -- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no]) -+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no]) - fi - - if test x$have_logind = xyes; then -@@ -124,6 +124,7 @@ have_elogind=no - PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no]) - if test x$have_elogind = xyes; then - AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported]) -+ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) - fi - - AC_SUBST(LOGIND_CFLAGS) -- cgit v1.2.3