From 08ff1393a76e025019e8cf39e29b2572094eb5ac Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 15 Nov 2015 22:55:17 +0100 Subject: gnome-extra/cinnamon-session: Drop old Package-Manager: portage-2.2.24 --- gnome-extra/cinnamon-session/Manifest | 2 - .../cinnamon-session/cinnamon-session-2.4.3.ebuild | 72 ---------------------- .../cinnamon-session/cinnamon-session-2.6.2.ebuild | 72 ---------------------- .../cinnamon-session-2.2.0-automagic-upower.patch | 33 ---------- 4 files changed, 179 deletions(-) delete mode 100644 gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild delete mode 100644 gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild delete mode 100644 gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch (limited to 'gnome-extra') diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest index 33aad7c8044d..54f3b194006e 100644 --- a/gnome-extra/cinnamon-session/Manifest +++ b/gnome-extra/cinnamon-session/Manifest @@ -1,4 +1,2 @@ -DIST cinnamon-session-2.4.3.tar.gz 903363 SHA256 07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733 SHA512 318815e786f447237bceb08689eca5cf499c7fb0bd70b86c16f76af49e8f43c2a8c78e4caa96c0253a5e088702933ee53996286a8d4c2a68fa346832f12ec317 WHIRLPOOL 13e6c4d2e606484ad8fd290f195f9db4de6a9d09073b6bd8ae3c34af7786fee4aeff8a94e6aab03f5178c2721ec251d7fd2122fe1882002cfd4fdcf74c4624e8 -DIST cinnamon-session-2.6.2.tar.gz 610789 SHA256 42ea718b77240ff24061203bc03ba6af7d51bcba2323b0bb73a56870e232cb92 SHA512 93b2caab5164de470794947a63dbb05a21f47c10d14df81f7563fac404be11423a7083e8e2aae20f41e4f43ae29bbb1131b5b1c56e2b2cc37aff0686a6d0c450 WHIRLPOOL e37b101665b49a7710237e63bb12634dc059cf56ba37b196cf24f6e6a2af7d9d6055005b646cb916fbbb47133c97c8126da76e2cd6c9f7845a529c2331886162 DIST cinnamon-session-2.6.3.tar.gz 612267 SHA256 391db79472cbd6c1546cec5e7e8e82f2a465fea92cda019fca14f7c54cfa4dc1 SHA512 91cf30dfd5fe7812c98d67233d54049ba11d04e142910f081a22bd48e2f0bbd0b4eeea4e66326628a0196c90164a146a2ef2ac61b26f289c17a0db8dbcc45a9b WHIRLPOOL f0841219624373c377e7f527b527682034d7b2519de105473395df87ab7aea3b130c5a45ad3141ca2fd4a1f523f3308b5af0e5409472e46131a6e68869134225 DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256 0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc WHIRLPOOL 6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild deleted file mode 100644 index 9ebfeb69fc0d..000000000000 --- a/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -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.76 - >=dev-libs/glib-2.32:2 - >=dev-libs/json-glib-0.10 - media-libs/libcanberra - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.90.7: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 ) -" -RDEPEND="${COMMON_DEPEND} - !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 check non-automagic - epatch "${FILESDIR}/${PN}-2.2.0-automagic-upower.patch" - epatch_user - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS README README.md" - - gnome2_src_configure \ - --disable-gconf \ - --disable-static \ - $(use_enable doc docbook-docs) \ - $(use_enable ipv6) \ - $(use_enable systemd) \ - $(usex systemd --disable-old-upower --enable-old-upower) -} diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild deleted file mode 100644 index 13d43b64feef..000000000000 --- a/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -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 ) -" -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 - epatch "${FILESDIR}/${PN}-2.6.2-automagic.patch" - epatch_user - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS README README.md" - - 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.2.0-automagic-upower.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch deleted file mode 100644 index 76246802e22a..000000000000 --- a/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2f88efdaaefefabcc16d13f2ae63f57244de01ce Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 5 May 2014 22:34:14 -0400 -Subject: [PATCH] Make old upower check non-automagic - ---- - configure.ac | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ec4ffac..a122872 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,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]) - ]) --- -1.9.2 - -- cgit v1.2.3-65-gdbad