From fbc1f6e8816def489f7ca2167f2c460daad33c4b Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 25 Sep 2018 09:06:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8=D0=B9=20ebuild?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnome-extra/cinnamon-session/Manifest | 1 - .../cinnamon-session-3.2.0-r1.ebuild | 70 ------------------- .../cinnamon-session-2.6.2-automagic.patch | 50 ------------- .../cinnamon-session-3.0.1-automagic.patch | 38 ---------- 4 files changed, 159 deletions(-) delete mode 100644 gnome-extra/cinnamon-session/Manifest delete mode 100644 gnome-extra/cinnamon-session/cinnamon-session-3.2.0-r1.ebuild delete mode 100644 gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch delete mode 100644 gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest deleted file mode 100644 index 982d20eb6..000000000 --- a/gnome-extra/cinnamon-session/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cinnamon-session-3.2.0.tar.gz 595530 SHA256 d7c3d951ae0dddef96941c9f08f028a099443888db41981524f618a92624e0ca SHA512 00475069849c7bb1d874c65200128128068e6500475c61053f07deabacb98046bf344ab5d3b4537487c48103dd6c6a8316d1326396e606a0d44bc486db9267d6 WHIRLPOOL 1753d5f99a98b718e0db8b945e94ade2c316bb7965943f2b1605b10dcc08a5e74661b4b7edcf8afdceb167c0ceffd57a0f97612c2638b13278240f695fae344e diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.2.0-r1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.2.0-r1.ebuild deleted file mode 100644 index 489b8df43..000000000 --- a/gnome-extra/cinnamon-session/cinnamon-session-3.2.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils gnome2 - -DESCRIPTION="Cinnamon session manager" -HOMEPAGE="http://cinnamon.linuxmint.com/" -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 ipv6 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 ) - !systemd? ( - || ( - >=sys-power/upower-pm-utils-0.9.23 - sys-power/upower - ) - ) -" -RDEPEND="${COMMON_DEPEND} - >=gnome-extra/cinnamon-desktop-2.6[systemd=] - !systemd? ( sys-auth/consolekit ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.40.6 - virtual/pkgconfig - doc? ( app-text/xmlto ) - - gnome-base/gnome-common -" -# gnome-base/gnome-common for eautoreconf - -src_prepare() { - # make upower and logind check non-automagic - eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-gconf \ - --disable-static \ - $(use_enable doc docbook-docs) \ - $(use_enable ipv6) \ - $(use_enable systemd logind) \ - $(usex systemd --disable-old-upower --enable-old-upower) -} diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch deleted file mode 100644 index 48843728f..000000000 --- a/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 586c07b431e9b0e1f11a9017ee0b84dc9b8ec08a Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 5 May 2014 22:34:14 -0400 -Subject: [PATCH] Make logind and old upower check non-automagic - ---- - configure.ac | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2f6fa7a..6e908cc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION, - - 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,7 +104,15 @@ dnl ==================================================================== - dnl Check for logind - dnl ==================================================================== - --PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [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-login >= 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]) --- -2.4.3 - 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 9ca31379a..000000000 --- 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])