1 |
commit: 86145eec87a70dab411262a0de691a0100a3d2ff |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 25 15:38:03 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 25 16:26:31 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86145eec |
7 |
|
8 |
gnome-extra/cinnamon-session: Version bump |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
gnome-extra/cinnamon-session/Manifest | 1 + |
13 |
.../cinnamon-session/cinnamon-session-3.0.1.ebuild | 66 ++++++++++++++++++++++ |
14 |
.../files/cinnamon-session-3.0.1-automagic.patch | 38 +++++++++++++ |
15 |
3 files changed, 105 insertions(+) |
16 |
|
17 |
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest |
18 |
index d50a561..cd45b12 100644 |
19 |
--- a/gnome-extra/cinnamon-session/Manifest |
20 |
+++ b/gnome-extra/cinnamon-session/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256 0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc WHIRLPOOL 6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b |
23 |
DIST cinnamon-session-2.8.3.tar.gz 591500 SHA256 306eb9448500b15b0d06826b66f438d767d001b706fd345c53b4a91d308ae4a9 SHA512 a581af6a00a5273ab4cf7b91ac4770b78d8ab670cf238c396e2087113795de059b4eaa3abcc8440b5eaa5cf0c4edc9696b183f9ce81803af36b9a3a37b5d5977 WHIRLPOOL d3c9d0f6791522c2c24801faacb0a5be34d658cceeaed2459d5f006c24e683d1ea39876045c505dd526ec972912e6c8bde8fffe703da6fa0f69a43f2e579ab61 |
24 |
+DIST cinnamon-session-3.0.1.tar.gz 592265 SHA256 d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89 SHA512 cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8 WHIRLPOOL 9af4cf92685e6a07220779ed8ef73c7435dff08e3771bbc87994d5294f998129b0d114a3092987b8fc59b49f936616d135ca59327d9979c70d9aec55238a0332 |
25 |
|
26 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild |
27 |
new file mode 100644 |
28 |
index 0000000..9d709f3 |
29 |
--- /dev/null |
30 |
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild |
31 |
@@ -0,0 +1,66 @@ |
32 |
+# Copyright 1999-2016 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+# $Id$ |
35 |
+ |
36 |
+EAPI=6 |
37 |
+inherit autotools eutils gnome2 |
38 |
+ |
39 |
+DESCRIPTION="Cinnamon session manager" |
40 |
+HOMEPAGE="http://cinnamon.linuxmint.com/" |
41 |
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" |
42 |
+ |
43 |
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
44 |
+SLOT="0" |
45 |
+KEYWORDS="~amd64 ~x86" |
46 |
+IUSE="doc ipv6 systemd" |
47 |
+ |
48 |
+COMMON_DEPEND=" |
49 |
+ >=dev-libs/dbus-glib-0.88 |
50 |
+ >=dev-libs/glib-2.37.3:2 |
51 |
+ media-libs/libcanberra |
52 |
+ x11-libs/gdk-pixbuf:2 |
53 |
+ >=x11-libs/gtk+-3:3 |
54 |
+ x11-libs/cairo |
55 |
+ x11-libs/libICE |
56 |
+ x11-libs/libSM |
57 |
+ x11-libs/libX11 |
58 |
+ x11-libs/libXau |
59 |
+ x11-libs/libXcomposite |
60 |
+ x11-libs/libXext |
61 |
+ x11-libs/libXrender |
62 |
+ x11-libs/libXtst |
63 |
+ x11-libs/pango[X] |
64 |
+ virtual/opengl |
65 |
+ systemd? ( >=sys-apps/systemd-183 ) |
66 |
+ !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) |
67 |
+" |
68 |
+RDEPEND="${COMMON_DEPEND} |
69 |
+ >=gnome-extra/cinnamon-desktop-2.6[systemd=] |
70 |
+ !systemd? ( sys-auth/consolekit ) |
71 |
+" |
72 |
+DEPEND="${COMMON_DEPEND} |
73 |
+ dev-libs/libxslt |
74 |
+ >=dev-util/intltool-0.40.6 |
75 |
+ virtual/pkgconfig |
76 |
+ doc? ( app-text/xmlto ) |
77 |
+ |
78 |
+ gnome-base/gnome-common |
79 |
+" |
80 |
+# gnome-base/gnome-common for eautoreconf |
81 |
+ |
82 |
+src_prepare() { |
83 |
+ # make upower and logind check non-automagic |
84 |
+ eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" |
85 |
+ eautoreconf |
86 |
+ gnome2_src_prepare |
87 |
+} |
88 |
+ |
89 |
+src_configure() { |
90 |
+ gnome2_src_configure \ |
91 |
+ --disable-gconf \ |
92 |
+ --disable-static \ |
93 |
+ $(use_enable doc docbook-docs) \ |
94 |
+ $(use_enable ipv6) \ |
95 |
+ $(use_enable systemd logind) \ |
96 |
+ $(usex systemd --disable-old-upower --enable-old-upower) |
97 |
+} |
98 |
|
99 |
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 |
100 |
new file mode 100644 |
101 |
index 0000000..9ca3137 |
102 |
--- /dev/null |
103 |
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch |
104 |
@@ -0,0 +1,38 @@ |
105 |
+--- a/configure.ac~ 2016-05-20 13:03:13.000000000 +0200 |
106 |
++++ b/configure.ac 2016-06-25 17:36:55.389583194 +0200 |
107 |
+@@ -56,7 +56,15 @@ |
108 |
+ |
109 |
+ dnl We can only support old upower |
110 |
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 |
111 |
+-PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) |
112 |
++AC_ARG_ENABLE([old-upower], |
113 |
++ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]), |
114 |
++ [enable_old_upower=$enableval], |
115 |
++ [enable_old_upower=auto]) |
116 |
++ |
117 |
++have_old_upower=no |
118 |
++if test x$enable_old_upower != xno ; then |
119 |
++ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) |
120 |
++fi |
121 |
+ AS_IF([test x$have_old_upower = xyes], [ |
122 |
+ AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) |
123 |
+ ]) |
124 |
+@@ -96,9 +104,15 @@ |
125 |
+ dnl Check for logind |
126 |
+ dnl ==================================================================== |
127 |
+ |
128 |
+-PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [ |
129 |
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no]) |
130 |
+-]) |
131 |
++AC_ARG_ENABLE([logind], |
132 |
++ AS_HELP_STRING([--disable-logind], [Do not check for logind]), |
133 |
++ [enable_logind=$enableval], |
134 |
++ [enable_logind=auto]) |
135 |
++ |
136 |
++have_logind=no |
137 |
++if test x$enable_logind != xno ; then |
138 |
++ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no]) |
139 |
++fi |
140 |
+ |
141 |
+ if test x$have_logind = xyes; then |
142 |
+ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) |