1 |
commit: a9de30da999248612cfaa11326c70ba821e31338 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 29 19:55:45 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Oct 29 19:55:45 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a9de30da |
7 |
|
8 |
net-libs/gnome-online-accounts: moved 3.2.1 to gx86 + make g-c-c dep optional |
9 |
|
10 |
The dependency on gnome-control-center should not be hard because it's |
11 |
not required for core goa functionality, and other DEs might want to use |
12 |
goa too. |
13 |
|
14 |
--- |
15 |
.../gnome-online-accounts-3.2.1.ebuild | 55 -------------------- |
16 |
.../gnome-online-accounts-9999.ebuild | 5 +- |
17 |
2 files changed, 3 insertions(+), 57 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild |
20 |
deleted file mode 100644 |
21 |
index 7a172b3..0000000 |
22 |
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,55 +0,0 @@ |
25 |
-# Copyright 1999-2011 Gentoo Foundation |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: $ |
28 |
- |
29 |
-EAPI="4" |
30 |
-GNOME2_LA_PUNT="yes" |
31 |
- |
32 |
-inherit gnome2 |
33 |
-if [[ ${PV} = 9999 ]]; then |
34 |
- inherit gnome2-live |
35 |
-fi |
36 |
- |
37 |
-DESCRIPTION="GNOME framework for accessing online accounts" |
38 |
-HOMEPAGE="http://www.gnome.org/" |
39 |
- |
40 |
-LICENSE="LGPL-2" |
41 |
-SLOT="0" |
42 |
-IUSE="doc +introspection" |
43 |
-if [[ ${PV} = 9999 ]]; then |
44 |
- KEYWORDS="" |
45 |
-else |
46 |
- KEYWORDS="~amd64 ~x86" |
47 |
-fi |
48 |
- |
49 |
-# pango used in goaeditablelabel |
50 |
-# libsoup used in goaoauthprovider |
51 |
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 |
52 |
-# and 2.30.0 |
53 |
-RDEPEND=" |
54 |
- >=dev-libs/glib-2.30.0:2 |
55 |
- dev-libs/json-glib |
56 |
- gnome-base/libgnome-keyring |
57 |
- net-libs/libsoup:2.4 |
58 |
- >=net-libs/libsoup-gnome-2.26:2.4 |
59 |
- net-libs/rest:0.7 |
60 |
- net-libs/webkit-gtk:3 |
61 |
- >=x11-libs/gtk+-3.0.0:3 |
62 |
- >=x11-libs/libnotify-0.7 |
63 |
- x11-libs/pango |
64 |
- |
65 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.2 )" |
66 |
-PDEPEND=">=gnome-base/gnome-control-center-3.2" |
67 |
-DEPEND="${RDEPEND} |
68 |
- dev-libs/libxslt |
69 |
- >=dev-util/gdbus-codegen-2.30.0 |
70 |
- dev-util/intltool |
71 |
- sys-devel/gettext |
72 |
- |
73 |
- doc? ( >=dev-util/gtk-doc-1.3 )" |
74 |
- |
75 |
-pkg_setup() { |
76 |
- G2CONF="${G2CONF} |
77 |
- --disable-static" |
78 |
- DOCS="NEWS" # README is empty |
79 |
-} |
80 |
|
81 |
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild |
82 |
index 7a172b3..16d063f 100644 |
83 |
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild |
84 |
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild |
85 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.gnome.org/" |
86 |
|
87 |
LICENSE="LGPL-2" |
88 |
SLOT="0" |
89 |
-IUSE="doc +introspection" |
90 |
+IUSE="doc gnome +introspection" |
91 |
if [[ ${PV} = 9999 ]]; then |
92 |
KEYWORDS="" |
93 |
else |
94 |
@@ -39,7 +39,8 @@ RDEPEND=" |
95 |
x11-libs/pango |
96 |
|
97 |
introspection? ( >=dev-libs/gobject-introspection-0.6.2 )" |
98 |
-PDEPEND=">=gnome-base/gnome-control-center-3.2" |
99 |
+# goa-daemon can launch gnome-control-center |
100 |
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2 )" |
101 |
DEPEND="${RDEPEND} |
102 |
dev-libs/libxslt |
103 |
>=dev-util/gdbus-codegen-2.30.0 |