Gentoo Archives: gentoo-commits

From: "Nirbheek Chauhan (nirbheek)" <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.26.0.ebuild
Date: Tue, 28 Sep 2010 10:52:22
Message-Id: 20100928105209.7562120051@flycatcher.gentoo.org
1 nirbheek 10/09/28 10:52:09
2
3 Modified: ChangeLog
4 Added: glib-2.26.0.ebuild
5 Log:
6 Bump to 2.26.0, stable release with various bug fixes
7
8 (Portage version: 2.1.9.10/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.425 dev-libs/glib/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.425&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.425&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.424&r2=1.425
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
20 retrieving revision 1.424
21 retrieving revision 1.425
22 diff -u -r1.424 -r1.425
23 --- ChangeLog 25 Sep 2010 14:59:47 -0000 1.424
24 +++ ChangeLog 28 Sep 2010 10:52:09 -0000 1.425
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-libs/glib
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.424 2010/09/25 14:59:47 nirbheek Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.425 2010/09/28 10:52:09 nirbheek Exp $
30 +
31 +*glib-2.26.0 (28 Sep 2010)
32 +
33 + 28 Sep 2010; <nirbheek@g.o> +glib-2.26.0.ebuild:
34 + Bump to 2.26.0, stable release with various bug fixes
35
36 25 Sep 2010; <nirbheek@g.o> glib-2.25.17.ebuild:
37 Drop patch that is no longer used for in-tree 2.24 ebuilds. Syncing error
38
39
40
41 1.1 dev-libs/glib/glib-2.26.0.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.26.0.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.26.0.ebuild?rev=1.1&content-type=text/plain
45
46 Index: glib-2.26.0.ebuild
47 ===================================================================
48 # Copyright 1999-2010 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.0.ebuild,v 1.1 2010/09/28 10:52:09 nirbheek Exp $
51
52 EAPI="2"
53
54 inherit autotools gnome.org libtool eutils flag-o-matic
55
56 DESCRIPTION="The GLib library of C routines"
57 HOMEPAGE="http://www.gtk.org/"
58
59 LICENSE="LGPL-2"
60 SLOT="2"
61 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
62 IUSE="debug doc fam hardened +introspection selinux static-libs test xattr"
63
64 RDEPEND="virtual/libiconv
65 sys-libs/zlib
66 xattr? ( sys-apps/attr )
67 fam? ( virtual/fam )"
68 DEPEND="${RDEPEND}
69 >=dev-util/pkgconfig-0.16
70 >=sys-devel/gettext-0.11
71 doc? (
72 >=dev-libs/libxslt-1.0
73 >=dev-util/gtk-doc-1.11
74 ~app-text/docbook-xml-dtd-4.1.2 )
75 test? ( >=sys-apps/dbus-1.2.14 )"
76 PDEPEND="introspection? ( dev-libs/gobject-introspection )"
77 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
78
79 src_prepare() {
80 if use ia64 ; then
81 # Only apply for < 4.1
82 local major=$(gcc-major-version)
83 local minor=$(gcc-minor-version)
84 if (( major < 4 || ( major == 4 && minor == 0 ) )); then
85 epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
86 fi
87 fi
88
89 # Don't fail gio tests when ran without userpriv, upstream bug 552912
90 # This is only a temporary workaround, remove as soon as possible
91 epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
92
93 # Fix gmodule issues on fbsd; bug #184301
94 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
95
96 # Don't check for python, hence removing the build-time python dep.
97 # We remove the gdb python scripts in src_install due to bug 291328
98 epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
99
100 # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
101 epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
102
103 # skip tests that require writing to /root/.dbus, upstream bug ???
104 epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
105
106 # Do not try to remove files on live filesystem, upstream bug #619274
107 sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
108 -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
109
110 # Needed for the punt-python-check patch.
111 eautoreconf
112
113 [[ ${CHOST} == *-freebsd* ]] && elibtoolize
114
115 epunt_cxx
116 }
117
118 src_configure() {
119 local myconf
120
121 # Building with --disable-debug highly unrecommended. It will build glib in
122 # an unusable form as it disables some commonly used API. Please do not
123 # convert this to the use_enable form, as it results in a broken build.
124 # -- compnerd (3/27/06)
125 use debug && myconf="--enable-debug"
126
127 # Always use internal libpcre, bug #254659
128 econf ${myconf} \
129 $(use_enable xattr) \
130 $(use_enable doc man) \
131 $(use_enable doc gtk-doc) \
132 $(use_enable fam) \
133 $(use_enable selinux) \
134 $(use_enable static-libs static) \
135 --enable-regex \
136 --with-pcre=internal \
137 --with-threads=posix
138 }
139
140 src_install() {
141 local f
142 emake DESTDIR="${D}" install || die "Installation failed"
143
144 # Do not install charset.alias even if generated, leave it to libiconv
145 rm -f "${D}/usr/lib/charset.alias"
146
147 # Don't install gdb python macros, bug 291328
148 rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
149
150 dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
151
152 insinto /usr/share/bash-completion
153 for f in gdbus gsettings; do
154 newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
155 done
156 rm -rf "${D}/etc"
157 }
158
159 src_test() {
160 unset DBUS_SESSION_BUS_ADDRESS
161 export XDG_CONFIG_DIRS=/etc/xdg
162 export XDG_DATA_DIRS=/usr/local/share:/usr/share
163 export XDG_DATA_HOME="${T}"
164 emake check || die "tests failed"
165 }
166
167 pkg_preinst() {
168 # Only give the introspection message if:
169 # * The user has it enabled
170 # * Has glib already installed
171 # * Previous version was different from new version
172 if use introspection && has_version "${CATEGORY}/${PN}"; then
173 if ! has_version "=${CATEGORY}/${PF}"; then
174 ewarn "You must rebuild gobject-introspection so that the installed"
175 ewarn "typelibs and girs are regenerated for the new APIs in glib"
176 fi
177 fi
178 }