Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/libgda: metadata.xml ChangeLog libgda-5.0.3-r1.ebuild libgda-5.0.3.ebuild libgda-4.2.9.ebuild libgda-5.0.2.ebuild
Date: Sun, 01 Apr 2012 18:20:38
Message-Id: 20120401182025.B2C5F2004B@flycatcher.gentoo.org
1 pacho 12/04/01 18:20:25
2
3 Modified: metadata.xml ChangeLog
4 Added: libgda-5.0.3-r1.ebuild
5 Removed: libgda-5.0.3.ebuild libgda-4.2.9.ebuild
6 libgda-5.0.2.ebuild
7 Log:
8 java-pkg-opt-2 default phases were being skipped by accident causing java detection problems like bug #401219 by Maciej Piechotka. Remove old.
9
10 (Portage version: 2.1.10.52/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.9 gnome-extra/libgda/metadata.xml
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/metadata.xml?rev=1.9&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/metadata.xml?rev=1.9&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/metadata.xml?r1=1.8&r2=1.9
18
19 Index: metadata.xml
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/libgda/metadata.xml,v
22 retrieving revision 1.8
23 retrieving revision 1.9
24 diff -u -r1.8 -r1.9
25 --- metadata.xml 16 Nov 2011 18:38:49 -0000 1.8
26 +++ metadata.xml 1 Apr 2012 18:20:25 -0000 1.9
27 @@ -11,6 +11,5 @@
28 <flag name="mdb">Enable support for Microsoft Access database using
29 <pkg>app-office/mdbtools</pkg></flag>
30 <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
31 - <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
32 </use>
33 </pkgmetadata>
34
35
36
37 1.196 gnome-extra/libgda/ChangeLog
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/ChangeLog?rev=1.196&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/ChangeLog?rev=1.196&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/ChangeLog?r1=1.195&r2=1.196
42
43 Index: ChangeLog
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v
46 retrieving revision 1.195
47 retrieving revision 1.196
48 diff -u -r1.195 -r1.196
49 --- ChangeLog 25 Mar 2012 16:31:51 -0000 1.195
50 +++ ChangeLog 1 Apr 2012 18:20:25 -0000 1.196
51 @@ -1,6 +1,14 @@
52 # ChangeLog for gnome-extra/libgda
53 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
54 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.195 2012/03/25 16:31:51 armin76 Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.196 2012/04/01 18:20:25 pacho Exp $
56 +
57 +*libgda-5.0.3-r1 (01 Apr 2012)
58 +
59 + 01 Apr 2012; Pacho Ramos <pacho@g.o> +libgda-5.0.3-r1.ebuild,
60 + -libgda-4.2.9.ebuild, -libgda-5.0.2.ebuild, -libgda-5.0.3.ebuild,
61 + metadata.xml:
62 + java-pkg-opt-2 default phases were being skipped by accident causing java
63 + detection problems like bug #401219 by Maciej Piechotka. Remove old.
64
65 25 Mar 2012; Raúl Porcel <armin76@g.o> libgda-4.2.11.ebuild:
66 alpha/ia64/sparc stable wrt #393007
67
68
69
70 1.1 gnome-extra/libgda/libgda-5.0.3-r1.ebuild
71
72 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild?rev=1.1&view=markup
73 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild?rev=1.1&content-type=text/plain
74
75 Index: libgda-5.0.3-r1.ebuild
76 ===================================================================
77 # Copyright 1999-2012 Gentoo Foundation
78 # Distributed under the terms of the GNU General Public License v2
79 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.1 2012/04/01 18:20:25 pacho Exp $
80
81 EAPI="4"
82 GNOME2_LA_PUNT="yes"
83 GCONF_DEBUG="yes"
84 PYTHON_DEPEND="2"
85
86 inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
87
88 DESCRIPTION="Gnome Database Access Library"
89 HOMEPAGE="http://www.gnome-db.org/"
90 LICENSE="GPL-2 LGPL-2"
91
92 IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala
93 SLOT="5"
94 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
95
96 RDEPEND="
97 app-text/iso-codes
98 >=dev-libs/glib-2.16:2
99 >=dev-libs/libxml2-2
100 dev-libs/libxslt
101 sys-libs/readline
102 sys-libs/ncurses
103 berkdb? ( sys-libs/db )
104 !bindist? ( firebird? ( dev-db/firebird ) )
105 gtk? (
106 >=x11-libs/gtk+-3.0.0:3
107 canvas? ( x11-libs/goocanvas:2.0 )
108 sourceview? ( x11-libs/gtksourceview:3.0 )
109 graphviz? ( media-gfx/graphviz )
110 )
111 gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
112 http? ( >=net-libs/libsoup-2.24:2.4 )
113 introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
114 json? ( dev-libs/json-glib )
115 ldap? ( net-nds/openldap )
116 mdb? ( >app-office/mdbtools-0.5 )
117 mysql? ( virtual/mysql )
118 postgres? ( dev-db/postgresql-base )
119 ssl? ( dev-libs/openssl )
120 >=dev-db/sqlite-3.6.22:3"
121
122 DEPEND="${RDEPEND}
123 >=dev-util/pkgconfig-0.18
124 >=dev-util/intltool-0.35.5
125 >=app-text/gnome-doc-utils-0.9
126 doc? ( >=dev-util/gtk-doc-1 )"
127 # vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )
128
129 pkg_setup() {
130 java-pkg-opt-2_pkg_setup
131
132 DOCS="AUTHORS ChangeLog NEWS README"
133
134 if use canvas || use graphviz || use sourceview; then
135 if ! use gtk; then
136 ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
137 ewarn "Disabling for now."
138 G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
139 else
140 G2CONF="${G2CONF}
141 $(use_with canvas goocanvas)
142 $(use_with graphviz)
143 $(use_with sourceview gtksourceview)"
144 fi
145 fi
146
147 G2CONF="${G2CONF}
148 --disable-scrollkeeper
149 --disable-static
150 --enable-system-sqlite
151 $(use_with berkdb bdb /usr)
152 $(use_with gnome-keyring)
153 $(use_with gtk ui)
154 $(use_with http libsoup)
155 $(use_enable introspection)
156 $(use_with java java $JAVA_HOME)
157 $(use_enable json)
158 $(use_with ldap)
159 $(use_with mdb mdb /usr)
160 $(use_with mysql mysql /usr)
161 $(use_with postgres postgres /usr)
162 $(use_enable ssl crypto)
163 --disable-vala
164 VAPIGEN=$(type -P vapigen-0.14)"
165 # $(use_enable vala)
166 # Disable vala due to https://bugzilla.gnome.org/show_bug.cgi?id=668701
167
168 if use bindist; then
169 # firebird license is not GPL compatible
170 G2CONF="${G2CONF} --without-firebird"
171 else
172 G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
173 fi
174
175 use berkdb && append-cppflags "-I$(db_includedir)"
176 use oci8 || G2CONF="${G2CONF} --without-oracle"
177
178 # Not in portage
179 G2CONF="${G2CONF}
180 --disable-default-binary"
181
182 python_set_active_version 2
183 python_pkg_setup
184 }
185
186 src_prepare() {
187 # Disable broken tests so we can check the others, upstream bug #????
188 # epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch"
189
190 # Prevent file collisions with libgda:4
191 epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
192 epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
193 epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
194
195 # Move files with mv (since epatch can't handle rename diffs) and
196 # update pre-generated gtk-doc files
197 local f
198 for f in tools/browser/doc/gda-browser* ; do
199 mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
200 done
201 for f in tools/browser/doc/html/gda-browser.devhelp* ; do
202 sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
203 -i ${f} || die "sed ${f} failed"
204 mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
205 done
206 for f in control-center/data/*_gda-control-center.png ; do
207 mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
208 die "mv ${f} failed"
209 done
210
211 python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
212
213 # Missing from tarball
214 cp "${FILESDIR}/libgda-${PV}-custom.vala" libgda/libgda-5.0-custom.vala || die
215
216 intltoolize --force --copy --automake || die "intltoolize failed"
217 eautoreconf
218 gnome2_src_prepare
219 java-pkg-opt-2_src_prepare
220 }
221
222 pkg_postinst() {
223 gnome2_pkg_postinst
224 local d
225 for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
226 python_mod_optimize ${d}
227 done
228 }
229
230 pkg_postrm() {
231 gnome2_pkg_postrm
232 local d
233 for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
234 python_mod_cleanup ${d}
235 done
236 }
Report Message
Find on MARC Find on Google Groups