Gentoo Archives: gentoo-commits

From: Alexandre Restovtsev <tetromino@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: app-crypt/seahorse/
Date: Mon, 27 Feb 2012 03:53:11
Message-Id: 1330314749.571478dfb1c66f3573159f33d29080a53f8575f0.tetromino@gentoo
1 commit: 571478dfb1c66f3573159f33d29080a53f8575f0
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 27 03:45:25 2012 +0000
4 Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
5 CommitDate: Mon Feb 27 03:52:29 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=571478df
7
8 app-crypt/seahorse: add 3.3.5
9
10 ---
11 ...{seahorse-9999.ebuild => seahorse-3.3.5.ebuild} | 23 ++++++-------------
12 app-crypt/seahorse/seahorse-9999.ebuild | 14 +++++-------
13 2 files changed, 13 insertions(+), 24 deletions(-)
14
15 diff --git a/app-crypt/seahorse/seahorse-9999.ebuild b/app-crypt/seahorse/seahorse-3.3.5.ebuild
16 similarity index 72%
17 copy from app-crypt/seahorse/seahorse-9999.ebuild
18 copy to app-crypt/seahorse/seahorse-3.3.5.ebuild
19 index c5d3c3a..67309b2 100644
20 --- a/app-crypt/seahorse/seahorse-9999.ebuild
21 +++ b/app-crypt/seahorse/seahorse-3.3.5.ebuild
22 @@ -1,29 +1,23 @@
23 # Copyright 1999-2011 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.32.0.ebuild,v 1.1 2010/10/17 19:12:26 pacho Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.2.ebuild,v 1.1 2011/11/17 06:11:08 tetromino Exp $
27
28 EAPI="4"
29 GCONF_DEBUG="yes"
30 GNOME2_LA_PUNT="yes"
31
32 inherit gnome2
33 -if [[ ${PV} = 9999 ]]; then
34 - inherit gnome2-live
35 -fi
36
37 DESCRIPTION="A GNOME application for managing encryption keys"
38 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
39
40 LICENSE="GPL-2"
41 SLOT="0"
42 -IUSE="avahi debug doc ldap test"
43 -if [[ ${PV} = 9999 ]]; then
44 - KEYWORDS=""
45 -else
46 - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
47 -fi
48 +IUSE="avahi debug ldap"
49 +KEYWORDS="~amd64 ~x86 ~x86-fbsd"
50
51 COMMON_DEPEND="
52 + >=app-crypt/gcr-3.3.4
53 >=dev-libs/glib-2.10:2
54 >=x11-libs/gtk+-2.90.0:3
55 >=gnome-base/gnome-keyring-3.1.5
56 @@ -45,7 +39,6 @@ DEPEND="${COMMON_DEPEND}
57 >=app-text/scrollkeeper-0.3
58 >=dev-util/pkgconfig-0.20
59 >=dev-util/intltool-0.35
60 - doc? ( >=dev-util/gtk-doc-1.9 )
61 "
62 # Need seahorse-plugins git snapshot
63 RDEPEND="${COMMON_DEPEND}
64 @@ -59,19 +52,17 @@ pkg_setup() {
65 --enable-pkcs11
66 --disable-static
67 --disable-scrollkeeper
68 - --disable-update-mime-database
69 --enable-hkp
70 $(use_enable avahi sharing)
71 $(use_enable debug)
72 - $(use_enable ldap)
73 - $(use_enable test tests)"
74 + $(use_enable ldap)"
75 DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
76 }
77
78 src_prepare() {
79 # FIXME: Do not mess with CFLAGS with USE="debug"
80 - sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
81 - -e 's/-Werror//' \
82 + sed -e '/CFLAGS="$CFLAGS -g/d' \
83 + -e '/CFLAGS="$CFLAGS -O0/d' \
84 -i configure.ac configure || die "sed 1 failed"
85
86 gnome2_src_prepare
87
88 diff --git a/app-crypt/seahorse/seahorse-9999.ebuild b/app-crypt/seahorse/seahorse-9999.ebuild
89 index c5d3c3a..018e3e1 100644
90 --- a/app-crypt/seahorse/seahorse-9999.ebuild
91 +++ b/app-crypt/seahorse/seahorse-9999.ebuild
92 @@ -16,14 +16,15 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
93
94 LICENSE="GPL-2"
95 SLOT="0"
96 -IUSE="avahi debug doc ldap test"
97 +IUSE="avahi debug ldap"
98 if [[ ${PV} = 9999 ]]; then
99 KEYWORDS=""
100 else
101 - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
102 + KEYWORDS="~amd64 ~x86 ~x86-fbsd"
103 fi
104
105 COMMON_DEPEND="
106 + >=app-crypt/gcr-3.3.4
107 >=dev-libs/glib-2.10:2
108 >=x11-libs/gtk+-2.90.0:3
109 >=gnome-base/gnome-keyring-3.1.5
110 @@ -45,7 +46,6 @@ DEPEND="${COMMON_DEPEND}
111 >=app-text/scrollkeeper-0.3
112 >=dev-util/pkgconfig-0.20
113 >=dev-util/intltool-0.35
114 - doc? ( >=dev-util/gtk-doc-1.9 )
115 "
116 # Need seahorse-plugins git snapshot
117 RDEPEND="${COMMON_DEPEND}
118 @@ -59,19 +59,17 @@ pkg_setup() {
119 --enable-pkcs11
120 --disable-static
121 --disable-scrollkeeper
122 - --disable-update-mime-database
123 --enable-hkp
124 $(use_enable avahi sharing)
125 $(use_enable debug)
126 - $(use_enable ldap)
127 - $(use_enable test tests)"
128 + $(use_enable ldap)"
129 DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
130 }
131
132 src_prepare() {
133 # FIXME: Do not mess with CFLAGS with USE="debug"
134 - sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
135 - -e 's/-Werror//' \
136 + sed -e '/CFLAGS="$CFLAGS -g/d' \
137 + -e '/CFLAGS="$CFLAGS -O0/d' \
138 -i configure.ac configure || die "sed 1 failed"
139
140 gnome2_src_prepare