Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/libcryptui/
Date: Sun, 28 Oct 2012 21:47:28
Message-Id: 1351460818.ba44ae09aa67402a821a15b9c1b1984ec361eff6.eva@gentoo
1 commit: ba44ae09aa67402a821a15b9c1b1984ec361eff6
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 28 21:46:58 2012 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 28 21:46:58 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ba44ae09
7
8 x11-libs/libcryptui: 3.4.1 → 3.6.0
9
10 ---
11 ...cryptui-9999.ebuild => libcryptui-3.6.0.ebuild} | 21 +++++++++++--------
12 x11-libs/libcryptui/libcryptui-9999.ebuild | 21 +++++++++++--------
13 2 files changed, 24 insertions(+), 18 deletions(-)
14
15 diff --git a/x11-libs/libcryptui/libcryptui-9999.ebuild b/x11-libs/libcryptui/libcryptui-3.6.0.ebuild
16 similarity index 86%
17 copy from x11-libs/libcryptui/libcryptui-9999.ebuild
18 copy to x11-libs/libcryptui/libcryptui-3.6.0.ebuild
19 index 8ae207e..7d2edd3 100644
20 --- a/x11-libs/libcryptui/libcryptui-9999.ebuild
21 +++ b/x11-libs/libcryptui/libcryptui-3.6.0.ebuild
22 @@ -16,8 +16,9 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
23
24 LICENSE="GPL-2 LGPL-2"
25 SLOT="0"
26 -IUSE="debug doc +introspection libnotify test"
27 +IUSE="+introspection libnotify test"
28 if [[ ${PV} = 9999 ]]; then
29 + IUSE="doc"
30 KEYWORDS=""
31 else
32 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
33 @@ -25,8 +26,8 @@ fi
34
35 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
36 COMMON_DEPEND="
37 - >=dev-libs/glib-2.10:2
38 - >=x11-libs/gtk+-2.90.0:3[introspection?]
39 + >=dev-libs/glib-2.32:2
40 + >=x11-libs/gtk+-3:3[introspection?]
41 >=dev-libs/dbus-glib-0.72
42 >=gnome-base/gnome-keyring-2.91.2
43 x11-libs/libICE
44 @@ -43,27 +44,29 @@ COMMON_DEPEND="
45 DEPEND="${COMMON_DEPEND}
46 sys-devel/gettext
47 >=app-text/scrollkeeper-0.3
48 + >=dev-util/gtk-doc-am-1.9
49 >=dev-util/intltool-0.35
50 virtual/pkgconfig
51 - doc? ( >=dev-util/gtk-doc-1.9 )
52 "
53 # Before 3.1.4, libcryptui was part of seahorse
54 RDEPEND="${COMMON_DEPEND}
55 !<app-crypt/seahorse-3.1.4
56 "
57
58 -pkg_setup() {
59 +if [[ ${PV} = 9999 ]]; then
60 + DEPEND="${DEPEND}
61 + doc? ( >=dev-util/gtk-doc-1.9 )"
62 +fi
63 +
64 +src_prepare() {
65 + DOCS="AUTHORS ChangeLog NEWS README"
66 G2CONF="${G2CONF}
67 --disable-static
68 --disable-update-mime-database
69 - $(use_enable debug)
70 $(use_enable introspection)
71 $(use_enable libnotify)
72 $(use_enable test tests)"
73 - DOCS="AUTHORS ChangeLog NEWS README"
74 -}
75
76 -src_prepare() {
77 # FIXME: Do not mess with CFLAGS with USE="debug"
78 sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
79 -e 's/-Werror//' \
80
81 diff --git a/x11-libs/libcryptui/libcryptui-9999.ebuild b/x11-libs/libcryptui/libcryptui-9999.ebuild
82 index 8ae207e..7d2edd3 100644
83 --- a/x11-libs/libcryptui/libcryptui-9999.ebuild
84 +++ b/x11-libs/libcryptui/libcryptui-9999.ebuild
85 @@ -16,8 +16,9 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
86
87 LICENSE="GPL-2 LGPL-2"
88 SLOT="0"
89 -IUSE="debug doc +introspection libnotify test"
90 +IUSE="+introspection libnotify test"
91 if [[ ${PV} = 9999 ]]; then
92 + IUSE="doc"
93 KEYWORDS=""
94 else
95 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
96 @@ -25,8 +26,8 @@ fi
97
98 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
99 COMMON_DEPEND="
100 - >=dev-libs/glib-2.10:2
101 - >=x11-libs/gtk+-2.90.0:3[introspection?]
102 + >=dev-libs/glib-2.32:2
103 + >=x11-libs/gtk+-3:3[introspection?]
104 >=dev-libs/dbus-glib-0.72
105 >=gnome-base/gnome-keyring-2.91.2
106 x11-libs/libICE
107 @@ -43,27 +44,29 @@ COMMON_DEPEND="
108 DEPEND="${COMMON_DEPEND}
109 sys-devel/gettext
110 >=app-text/scrollkeeper-0.3
111 + >=dev-util/gtk-doc-am-1.9
112 >=dev-util/intltool-0.35
113 virtual/pkgconfig
114 - doc? ( >=dev-util/gtk-doc-1.9 )
115 "
116 # Before 3.1.4, libcryptui was part of seahorse
117 RDEPEND="${COMMON_DEPEND}
118 !<app-crypt/seahorse-3.1.4
119 "
120
121 -pkg_setup() {
122 +if [[ ${PV} = 9999 ]]; then
123 + DEPEND="${DEPEND}
124 + doc? ( >=dev-util/gtk-doc-1.9 )"
125 +fi
126 +
127 +src_prepare() {
128 + DOCS="AUTHORS ChangeLog NEWS README"
129 G2CONF="${G2CONF}
130 --disable-static
131 --disable-update-mime-database
132 - $(use_enable debug)
133 $(use_enable introspection)
134 $(use_enable libnotify)
135 $(use_enable test tests)"
136 - DOCS="AUTHORS ChangeLog NEWS README"
137 -}
138
139 -src_prepare() {
140 # FIXME: Do not mess with CFLAGS with USE="debug"
141 sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
142 -e 's/-Werror//' \